More MP1 SetupForm cleanup