s6 VIEWMODEL cleanup