Some clean up.
Merge pull request #74 from rudigens/rtc

Some clean up.