===> Cleaning for kitty-0.21.1