Disable keepalives on old clang compiler used for nightly
until we can upgrade it
Remove accidentally-committed garbage