ViewModel cleanup

Merged Sebastian requested to merge 2019-viewmodel-cleanup into master

Merge request reports