===> Cleaning for shlock-20080529