===> Cleaning for psi-0.15