===> Cleaning for picp-0.6.7