Clean up obsolete code

* Removing obsolete files