Removed unused classes.  Formatting refactor