clean up form groups