Removed some more php 5.3 hacks
Removed a load more old hacls