Refactor add/remove time

Removed moment and replaced it with Date class for consistency