diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/feature/FeatureConfigurationDao.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/feature/FeatureConfigurationDao.java
index 56b3e1290dd..3672ba1b792 100644
--- a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/feature/FeatureConfigurationDao.java
+++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/feature/FeatureConfigurationDao.java
@@ -171,43 +171,6 @@ public boolean isPropertyValueTrue(FeatureType featureType, FeatureTypeProperty
 		return result;
 	}
 
-	public String getStringPropertyValue(FeatureType featureType, FeatureTypeProperty property) {
-		if (!featureType.getSupportedProperties().contains(property)) {
-			throw new IllegalArgumentException("Feature type " + featureType + " does not support property " + property + ".");
-		}
-
-		if (!String.class.isAssignableFrom(property.getReturnType())) {
-			throw new IllegalArgumentException(
-					"Feature type property " + property + " does not have specified return type " + String.class.getSimpleName() + ".");
-		}
-
-		Map<FeatureTypeProperty, Object> propertyObjectMap;
-		try {
-			QueryBuilder builder = queryBuilder();
-			Where where = builder.where();
-			where.eq(FeatureConfiguration.FEATURE_TYPE, featureType);
-			builder.selectColumns(FeatureConfiguration.PROPERTIES);
-
-			FeatureConfiguration featureConfiguration = (FeatureConfiguration) builder.queryForFirst();
-
-			if (featureConfiguration != null && featureConfiguration.getPropertiesJson() != null) {
-				propertyObjectMap = featureConfiguration.getPropertiesMap();
-			} else {
-				return (String) featureType.getSupportedPropertyDefaults().get(property);
-			}
-
-		} catch (SQLException e) {
-			Log.e(getTableName(), "Could not perform getStringPropertyValue");
-			throw new RuntimeException(e);
-		}
-
-		if (propertyObjectMap != null && propertyObjectMap.containsKey(property)) {
-			return (String) propertyObjectMap.get(property);
-		} else {
-			return null;
-		}
-	}
-
 	public boolean isAnySurveillanceEnabled() {
 		return !isFeatureDisabled(FeatureType.CASE_SURVEILANCE)
 			|| !isFeatureDisabled(FeatureType.EVENT_SURVEILLANCE)
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java
index 48072ab7984..cee6d35fa8a 100644
--- a/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java
+++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/backend/user/UserDtoHelper.java
@@ -135,7 +135,6 @@ public static UserReferenceDto toReferenceDto(User ado) {
 	}
 
 	public static Call<String> saveNewPassword(String uuid, String newPassword) throws NoConnectionException {
-		System.out.println(uuid+" pw: "+newPassword);
 		return RetroProvider.getUserFacade().saveNewPassword(new UserPasswordChangeDto(uuid,newPassword));
 	}
 
diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/settings/SettingsFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/settings/SettingsFragment.java
index f2dd70648c5..260130eaffe 100644
--- a/sormas-app/app/src/main/java/de/symeda/sormas/app/settings/SettingsFragment.java
+++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/settings/SettingsFragment.java
@@ -33,7 +33,6 @@
 import java.util.List;
 
 import de.symeda.sormas.api.Language;
-import de.symeda.sormas.api.feature.FeatureTypeProperty;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.utils.InfoProvider;
 import de.symeda.sormas.app.BaseLandingFragment;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java
index 107a9dc4f88..e8e8d985217 100644
--- a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java
+++ b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/KeycloakService.java
@@ -65,7 +65,6 @@
 import de.symeda.sormas.backend.user.event.SyncUsersFromProviderEvent;
 import de.symeda.sormas.backend.user.event.UserCreateEvent;
 import de.symeda.sormas.backend.user.event.UserUpdateEvent;
-import de.symeda.sormas.backend.user.event.PasswordChangeEvent;
 
 /**
  * @author Alex Vidrean
diff --git a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/UserResource.java b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/UserResource.java
index d3a317c15a7..cc6e4ee9e85 100644
--- a/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/UserResource.java
+++ b/sormas-rest/src/main/java/de/symeda/sormas/rest/resources/UserResource.java
@@ -18,7 +18,6 @@
 import java.util.Date;
 import java.util.List;
 
-import javax.validation.Valid;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserController.java
index 97777a68c52..27b5503baa0 100644
--- a/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserController.java
+++ b/sormas-ui/src/main/java/de/symeda/sormas/ui/user/UserController.java
@@ -595,5 +595,4 @@ public CommitDiscardWrapperComponent<UpdatePasswordForm> getUpdatePasswordCompon
 
 		return component;
 	}
-
 }