Remove singleton and retain viewmodels in activity