more form cleanup for connections and saving