redelete jobs that are not needed
Merge branch 'consolidate-login-servers' into consolidate-login-servers-working