First pass cleanup of CheckAutoBootstrap
First pass cleanup of SetPolicyServer
Remove various warnings