removing Garmin and Tomtom portions of app, plus some more cleanup