===> Cleaning for enigma-1.21