Excess classes cleaned up