Feature/desktop android cleanup