Code update, remove redundant handlers and runnables