===> Cleaning for rc-1.7.4