propagating pedsim cleanup changes