Edit form cleanup