Code Cleanup: RideNavigator

Remove XXX and commented out code. No functional changes.