More form cleanup