===> Cleaning for kalker-2.1.1