finished cleanup of form editor