Cleaning up location field