Edit form cleanup.