Removed some obsolete classes.