KeyHandler: remove more unused code