removed some PHP 5.2 workarounds