Properly remove remapping, and fix environmental -> environment.