Revert "Models and form changes"