Properly stop the services.

Services are now being terminated inside the locator, so no need to
terminate them again in other places.