Removing PHP5.4 features