Remove deferred

Fix problem when using the class instead of facade/container