cleanup in form controller