API cleanup, Deferred removed