Removed unnecessary runnables