fix issues with deleted files
lint
Merge branch 'jeff/splitview-1x2' into jeff/splitview-factory