Started cleaning KeyHandler