===> Cleaning for scrc-2.1