Removed some of the -(id) classes.