Map is working - cleanup needed