appears module TimeStamps intact, cleaned up many files