Refactor model code

Remove redundant code (leftovers from old conformance validations)
Improve spec coverage for newly ported code (from frontend app)