master: clean up forms