Remove NewView model
Remove annotations field from view objects
Whitespace cleanup
Merge branch 'view-model'

* view-model:
  Whitespace cleanup
  Remove annotations field from view objects
  Remove NewView model