Revert 53d81ff..b69df5c

This rolls back to commit 53d81ff4045018dccdbe2b89bcf8099a4e946648.
Cleaning up code remnants from RossClock