Elimiante closures for PHP 5.2 compat