Deleted unused files
Cleaned up a number of TODOs
Added in a few comments