Even more SetupForm cleanup