Mapping clean up