Cleanup

Removed a bunch of code that was used during testing and added
additional comments to code.