Slimmed down code, added more docs
Slimmed down the code.
Removed a leftover file.