Remove TimeoutDeferredQueue usage
Clean code