cleanup from redundant classes