clean-up/add multivalue forms