More clean-up in preparation for TimeSources