refactored out time compare.  Add #remove.