remove viewmodels and continue development