Code Cleanup: Ride Data and Friends

.. cleaning XXX and misleading comments