removed deferred extensions for now