clean out a lot of unneeded code
remove unneeded comments