Merge "Remove unused view models" into main