Removed all call_user_func calls