Removed two unneccessary classes.