Remove obsolete files.
Remove obsolete files.
Remove obsolete file.
Clean up
Merge pull request #4502 from ianna/replace-timeme

Clean up obsolete code