form clean-up, update to v3