removed unnecessary, problematic classes