clean up form types