Cleanup, remove unused flags on kk