remove mappings amix already did, add enhanced mapping for visual