Navigation and flake cleanup