===> Cleaning for kitty-0.15.0