remove unused data
removed all TODOs
Merge pull request #1 from jonwho/clean_up_comments_and_code

Clean up comments and code