Minor cleanup
RTC functions first cut