Some more cleanup.
Merge pull request #75 from rudigens/rtc

Some more cleanup.