Cleanup hotkey code