Remove comment
Comment out unneeded classes.  Schedule for deletion