@trivial forms cleanup