Clean up

* Remove obsolete code
* Add doc strings