===> Cleaning for rpc2-2.10