additional form cleanup