Clean up the code

[hannahschwen]

Go through everything and clean it up, delete what's not needed, add comments and clarify existing comments.

[swokamoto]

i did a first pass at cleaning up code and removing unused code