Updated some of the comments and removed some unused classes.