Clean up MVVM code base.