MediaManager and Geolocation cleanup