Removed unneeded call_user_func_array calls