Conversion Tracking Cleanup

Another amazing job from Thomas!