Removed two older classes.