remove problematic classes