diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7cd663d7e01d..a29e788aee3c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -182,4 +182,4 @@
       </arrangement>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/build.gradle b/build.gradle
index 4baa453b59f6..7dcafdd446e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -356,6 +356,7 @@ dependencies {
     //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
     androidTestImplementation 'tools.fastlane:screengrab:1.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
 
 //    jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
 //    jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
diff --git a/nextcloud-android-library b/nextcloud-android-library
deleted file mode 120000
index 56a1b164a824..000000000000
--- a/nextcloud-android-library
+++ /dev/null
@@ -1 +0,0 @@
-../android-library
\ No newline at end of file
diff --git a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
index 57038392b9dd..b80c5f30ae23 100644
--- a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java
@@ -48,9 +48,6 @@
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.R;
-import com.owncloud.android.datamodel.ArbitraryDataProvider;
-import com.owncloud.android.datamodel.PushConfigurationState;
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.UserInfo;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
@@ -67,8 +64,6 @@
 
 import javax.inject.Inject;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
@@ -266,7 +261,7 @@ private void populateUserInfoUi(UserInfo userInfo) {
 
         if (userInfo == null || userInfo.isEmpty()) {
             setErrorMessageForMultiList(getString(R.string.userinfo_no_info_headline),
-                getString(R.string.userinfo_no_info_text), R.drawable.ic_user);
+                                        getString(R.string.userinfo_no_info_text));
         } else {
             if (!TextUtils.isEmpty(userInfo.getDisplayName())) {
                 fullName.setText(userInfo.getDisplayName());