Remove pointless classes