Cleaning up services to use the location class