Clean up some more key mappings