===> Cleaning for kitty-0.37.0