Massive proto cleanup