===> Cleaning for popt-1.19