Cleaned out some old comments and cruff that didn't need to be there