don't check which user, since we don't have multiple users anyway currently.
Removing serval section as it will not be ready for R1