Remove injected also for no action. Should not make a difference
Cleanup, limiting scope for delay