Removed some stuff

I stole the framework from this code, but had to remove most of it and
rewrite, so I removed some comments pertaining to old code.