===> Cleaning for kitty-0.36.4