Added hotkey cleanup to classes that register them