Fix fatal bug in removeLocations() and Remove extraneous removeLocation() method