is this before or after removing classes_by_target? Or both