Cleaned code

Cleaned up extraneous comments, got rid of unused classes (particularly
those I don't plan to use), and added a few TODOs for me to deal with
later.