Cleaned some code

* Removed old features