Remove key code workaround