Cleaning time

* Cleaning some dead code