===> Cleaning for bsvc-2.1