Implement clear functionality
Remove clear functionality until timestamp storage can be fixed
Minor refactor, and collision avoidance