===> Cleaning for poink-1.6