Additional form handler clean-up