Clean some classes