TimeService is not longer used
clean unused import
Merge pull request #1 from mgreau/master

Update from original