Cleanup/refactoring of servers model

* Removed unused code
* Made all model params named/optional
* Removed references to ROOT_TAG

Change-Id: I41802f398e97120fa9157c23b50a4ffcd48c72b5
Merge "Cleanup/refactoring of servers model"