===> Cleaning for pd-0.43.0