Additional cleanup of SetupCommand