Start of removal of model tag vars

* Removed tag/root tag vars from models except where still needed
  for auto serialization

Change-Id: I261bfd4bfa9cd6e9c0b8fb3eba3a3ef39f2aab00
Merge "Start of removal of model tag vars"