Remove Cartographer_Waypoints support

Apparently it has been dead for years
Fix TomTom support

See comments