Cleaning time

* Removing leftover references that are no longer needed