Removal of remove_classes_not_in_environment