Removed legacy key-mapping