More cleanup work on MVVM project