===> Cleaning for udfclient-0.7.1