Handling time
Removed depencies