Fixed issue #55.  Removed unused classes.