remove a bunch of comments
make a note for future refactoring