Some classes were doing more than they should