===> Cleaning for kitty-0.12.3