more form cleanup