Remove all calls to call_user_func()