Removing 5.4 syntax