diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
index 28f760583..267f14c3a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/footer/UploadViewConfirmationWindowLayout.java
@@ -54,7 +54,7 @@ public class UploadViewConfirmationWindowLayout extends AbstractConfirmationWind
 
     private final ArtifactUploadState artifactUploadState;
 
-    public UploadViewConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus,
+    UploadViewConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus,
             final SoftwareManagement softwareManagement, final ArtifactUploadState artifactUploadState) {
         super(i18n, eventBus);
         this.softwareManagement = softwareManagement;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
index 4fd194926..5960b44f6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
@@ -36,8 +36,6 @@ import com.vaadin.ui.Window;
 
 /**
  * Software module details.
- * 
- *
  */
 public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDetailsLayout<SoftwareModule> {
 
@@ -53,8 +51,7 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
 
     private final SoftwareModuleMetadatadetailslayout swmMetadataTable;
 
-    public SoftwareModuleDetails(final I18N i18n, final UIEventBus eventBus,
-            final SpPermissionChecker permissionChecker,
+    SoftwareModuleDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
             final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow,
             final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
             final SwMetadataPopupLayout swMetadataPopupLayout, final EntityFactory entityFactory) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
index 57fa5a65a..4221b0301 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTable.java
@@ -65,7 +65,7 @@ public class SoftwareModuleTable extends AbstractNamedVersionTable<SoftwareModul
 
     private final SwMetadataPopupLayout swMetadataPopupLayout;
 
-    public SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
+    SoftwareModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
             final ArtifactUploadState artifactUploadState, final SoftwareManagement softwareManagement,
             final UploadViewAcceptCriteria uploadViewAcceptCriteria, final EntityFactory entityFactory,
             final SpPermissionChecker permChecker, final SwMetadataPopupLayout swMetadataPopupLayout) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
index c7518fc84..395343d9d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleTableHeader.java
@@ -38,7 +38,7 @@ public class SoftwareModuleTableHeader extends AbstractTableHeader {
 
     private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
 
-    public SoftwareModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
+    SoftwareModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
             final ArtifactUploadState artifactUploadState, final UINotification uiNotifcation,
             final UIEventBus eventBus, final SoftwareManagement softwareManagement, final EntityFactory entityFactory,
             final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java
index 46e512f3b..6e4771b0b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtonClick.java
@@ -33,7 +33,7 @@ public class SMTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
 
     private final transient SoftwareManagement softwareManagement;
 
-    public SMTypeFilterButtonClick(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
+    SMTypeFilterButtonClick(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
             final SoftwareManagement softwareManagement) {
         this.eventBus = eventBus;
         this.artifactUploadState = artifactUploadState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java
index bd09fac3f..12160bbcd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterButtons.java
@@ -42,7 +42,7 @@ public class SMTypeFilterButtons extends AbstractFilterButtons {
 
     private final UploadViewAcceptCriteria uploadViewAcceptCriteria;
 
-    public SMTypeFilterButtons(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
+    SMTypeFilterButtons(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
             final UploadViewAcceptCriteria uploadViewAcceptCriteria, final SoftwareManagement softwareManagement) {
         super(eventBus, new SMTypeFilterButtonClick(eventBus, artifactUploadState, softwareManagement));
         this.artifactUploadState = artifactUploadState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java
index 2c0984b02..94cac35d9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SMTypeFilterHeader.java
@@ -36,7 +36,7 @@ public class SMTypeFilterHeader extends AbstractFilterHeader {
     private final ArtifactUploadState artifactUploadState;
     private final CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout;
 
-    public SMTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
+    SMTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
             final ArtifactUploadState artifactUploadState, final TagManagement tagManagement,
             final EntityFactory entityFactory, final UINotification uiNotification,
             final SoftwareManagement softwareManagement) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/CustomFile.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/CustomFile.java
index 3dbbcc7db..df36f88a0 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/CustomFile.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/state/CustomFile.java
@@ -85,16 +85,6 @@ public class CustomFile implements Serializable {
         this.baseSoftwareModuleVersion = baseSoftwareModuleVersion;
     }
 
-    /**
-     * Default constructor with the immutable fileName set.
-     *
-     * @param fileName
-     *            uploaded file name
-     */
-    public CustomFile(final String fileName) {
-        this.fileName = fileName;
-    }
-
     public String getBaseSoftwareModuleName() {
         return baseSoftwareModuleName;
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java
index 83674c4ef..1d0f56e4a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadConfirmationWindow.java
@@ -124,8 +124,7 @@ public class UploadConfirmationWindow implements Button.ClickListener {
      * @param artifactUploadState
      *            reference of session variable {@link ArtifactUploadState}.
      */
-    public UploadConfirmationWindow(final UploadLayout artifactUploadView,
-            final ArtifactUploadState artifactUploadState) {
+    UploadConfirmationWindow(final UploadLayout artifactUploadView, final ArtifactUploadState artifactUploadState) {
         this.uploadLayout = artifactUploadView;
         this.artifactUploadState = artifactUploadState;
         i18n = artifactUploadView.getI18n();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java
index 4b1de1bc1..ee38abbb9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadResultWindow.java
@@ -72,7 +72,7 @@ public class UploadResultWindow implements Button.ClickListener {
      * @param i18n
      *            I18N
      */
-    public UploadResultWindow(final List<UploadStatus> uploadResultList, final I18N i18n) {
+    UploadResultWindow(final List<UploadStatus> uploadResultList, final I18N i18n) {
         this.uploadResultList = uploadResultList;
         this.i18n = i18n;
         eventBus = SpringContextHelper.getBean(EventBus.UIEventBus.class);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java
index 7b4aebc44..0d3e9e989 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusInfoWindow.java
@@ -93,8 +93,7 @@ public class UploadStatusInfoWindow extends Window {
 
     private ConfirmationDialog confirmDialog;
 
-    public UploadStatusInfoWindow(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState,
-            final I18N i18n) {
+    UploadStatusInfoWindow(final UIEventBus eventBus, final ArtifactUploadState artifactUploadState, final I18N i18n) {
         this.eventBus = eventBus;
         this.artifactUploadState = artifactUploadState;
         this.i18n = i18n;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java
index eec189eaf..82e003be8 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java
@@ -27,15 +27,7 @@ public class UploadStatusObject implements Serializable {
     private String reason;
     private final SoftwareModule selectedSoftwareModule;
 
-    public UploadStatusObject(final String status, final Double progress, final String fileName, final String reason,
-            final SoftwareModule selectedSoftwareModule) {
-        this(fileName, selectedSoftwareModule);
-        this.status = status;
-        this.progress = progress;
-        this.reason = reason;
-    }
-
-    public UploadStatusObject(final String fileName, final SoftwareModule selectedSoftwareModule) {
+    UploadStatusObject(final String fileName, final SoftwareModule selectedSoftwareModule) {
         this.filename = fileName;
         this.selectedSoftwareModule = selectedSoftwareModule;
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerLayout.java
index e748a4072..29c8c1ff9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/colorpicker/ColorPickerLayout.java
@@ -62,7 +62,7 @@ public class ColorPickerLayout extends GridLayout {
         addComponent(colorSelect, 1, 1, 1, 3);
     }
 
-    public void init() {
+    private void init() {
 
         selectors = new HashSet<>();
         selectedColor = getDefaultColor();
@@ -80,7 +80,7 @@ public class ColorPickerLayout extends GridLayout {
         selectors.add(colorSelect);
     }
 
-    public Slider createRGBSlider(final String caption, final String styleName) {
+    private Slider createRGBSlider(final String caption, final String styleName) {
         final Slider slider = new Slider(caption, 0, 255);
         slider.setImmediate(true);
         slider.setWidth("150px");
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/DistributionSetInfoPanel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/DistributionSetInfoPanel.java
index d3dd5b63d..ea02b6128 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/DistributionSetInfoPanel.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/DistributionSetInfoPanel.java
@@ -19,9 +19,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Distribution set panel for Target.
- *
- *
- *
  */
 @SuppressWarnings("serial")
 public class DistributionSetInfoPanel extends Panel {
@@ -38,9 +35,8 @@ public class DistributionSetInfoPanel extends Panel {
      * @param style2
      *            as String
      */
-    public DistributionSetInfoPanel(final DistributionSet distributionSet, final String caption, final String style1,
+    DistributionSetInfoPanel(final DistributionSet distributionSet, final String caption, final String style1,
             final String style2) {
-        super();
         setImmediate(false);
         decorate(distributionSet, caption, style1, style2);
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPTargetAttributesLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPTargetAttributesLayout.java
index fc363acf8..cb45ca2d9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPTargetAttributesLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPTargetAttributesLayout.java
@@ -21,9 +21,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Attributes Vertical layout for Target.
- *
- *
- *
  */
 public class SPTargetAttributesLayout {
     private final VerticalLayout targetAttributesLayout;
@@ -35,7 +32,7 @@ public class SPTargetAttributesLayout {
      *            controller attributes
      *
      */
-    public SPTargetAttributesLayout(final Map<String, String> controllerAttibs) {
+    SPTargetAttributesLayout(final Map<String, String> controllerAttibs) {
         targetAttributesLayout = new VerticalLayout();
         targetAttributesLayout.setSpacing(true);
         targetAttributesLayout.setMargin(true);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java
index 2dfdad723..7f19bb5f2 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java
@@ -13,29 +13,11 @@ import com.vaadin.ui.Button;
 
 /**
  * Basic button for SPUI. Any commonality can be decorated.
- * 
- *
- *
  */
-
 public class SPUIButton extends Button {
-
-    /**
-     * ID.
-     */
     private static final long serialVersionUID = -7327726430436273739L;
 
-    /**
-     * Parametric constructor.
-     * 
-     * @param id
-     *            as String
-     * @param buttonName
-     *            as String
-     * @param buttonDesc
-     *            as String
-     */
-    public SPUIButton(final String id, final String buttonName, final String buttonDesc) {
+    SPUIButton(final String id, final String buttonName, final String buttonDesc) {
         super(buttonName);
         setDescription(buttonDesc);
         setImmediate(false);
@@ -50,7 +32,7 @@ public class SPUIButton extends Button {
      * @param icon
      *            as Resource
      */
-    public void togleIcon(Resource icon) {
+    public void togleIcon(final Resource icon) {
         setIcon(icon);
     }
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUICheckBox.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUICheckBox.java
index 753cafa7f..f75a03cd7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUICheckBox.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUICheckBox.java
@@ -13,32 +13,13 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * ComboBox with required style.
- * 
- *
- *
  */
 public class SPUICheckBox extends CheckBox {
 
     private static final long serialVersionUID = 2270323611612189225L;
 
-    /**
-     * Parametric constructor to decorate.
-     * 
-     * @param caption
-     *            as caption for checkbox
-     * @param style
-     *            style of the CheckBox
-     * @param styleName
-     *            styleName of the CheckBox
-     * @param required
-     *            required check for Checkbox
-     * @param data
-     *            data of the CheckBox
-     * 
-     */
-    public SPUICheckBox(final String caption, final String style, final String styleName, final boolean required,
+    SPUICheckBox(final String caption, final String style, final String styleName, final boolean required,
             final String data) {
-        super();
         decorate(caption, style, styleName, required, data);
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
index 8dbe2a2f9..ef96a68f1 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtonClick.java
@@ -33,7 +33,7 @@ public class DSTypeFilterButtonClick extends AbstractFilterSingleButtonClick imp
 
     private final DistributionSetManagement distributionSetManagement;
 
-    public DSTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
+    DSTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
             final DistributionSetManagement distributionSetManagement) {
         this.eventBus = eventBus;
         this.manageDistUIState = manageDistUIState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java
index 50e6ac22c..5c380f43c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterButtons.java
@@ -39,7 +39,7 @@ public class DSTypeFilterButtons extends AbstractFilterButtons {
 
     private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
 
-    public DSTypeFilterButtons(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
+    DSTypeFilterButtons(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
             final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria,
             final DistributionSetManagement distributionSetManagement) {
         super(eventBus, new DSTypeFilterButtonClick(eventBus, manageDistUIState, distributionSetManagement));
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java
index 1bc3ec631..7aa464fda 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DSTypeFilterHeader.java
@@ -37,7 +37,7 @@ public class DSTypeFilterHeader extends AbstractFilterHeader {
 
     private final CreateUpdateDistSetTypeLayout createUpdateDistSetTypeLayout;
 
-    public DSTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
+    DSTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
             final ManageDistUIState manageDistUIState, final TagManagement tagManagement,
             final EntityFactory entityFactory, final UINotification uiNotification,
             final SoftwareManagement softwareManagement, final DistributionSetManagement distributionSetManagement) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
index 5fcd9346a..2bfaf4753 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
@@ -71,16 +71,14 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
 
     private final DistributionTagToken distributionTagToken;
 
-    private final SoftwareManagement softwareManagement;
+    private final transient SoftwareManagement softwareManagement;
 
-    private final DistributionSetManagement distributionSetManagement;
+    private final transient DistributionSetManagement distributionSetManagement;
 
-    private final TargetManagement targetManagement;
+    private final transient TargetManagement targetManagement;
 
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
 
-    private final EntityFactory entityFactory;
-
     private final SoftwareModuleDetailsTable softwareModuleTable;
 
     private final DistributionSetMetadatadetailslayout dsMetadataTable;
@@ -91,9 +89,8 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
 
     private Map<String, StringBuilder> assignedSWModule;
 
-    public DistributionSetDetails(final I18N i18n, final UIEventBus eventBus,
-            final SpPermissionChecker permissionChecker, final ManageDistUIState manageDistUIState,
-            final ManagementUIState managementUIState,
+    DistributionSetDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
+            final ManageDistUIState manageDistUIState, final ManagementUIState managementUIState,
             final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout,
             final SoftwareManagement softwareManagement, final DistributionSetManagement distributionSetManagement,
             final TargetManagement targetManagement, final EntityFactory entityFactory,
@@ -108,7 +105,6 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
         this.distributionSetManagement = distributionSetManagement;
         this.targetManagement = targetManagement;
         this.dsMetadataPopupLayout = popupLayout;
-        this.entityFactory = entityFactory;
 
         softwareModuleTable = new SoftwareModuleDetailsTable(i18n, true, permissionChecker, distributionSetManagement,
                 eventBus, manageDistUIState);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
index bc424dbac..d2ba963eb 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTable.java
@@ -98,7 +98,7 @@ public class DistributionSetTable extends AbstractNamedVersionTable<Distribution
 
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
 
-    public DistributionSetTable(final UIEventBus eventBus, final I18N i18n, final UINotification notification,
+    DistributionSetTable(final UIEventBus eventBus, final I18N i18n, final UINotification notification,
             final SpPermissionChecker permissionChecker, final ManageDistUIState manageDistUIState,
             final DistributionSetManagement distributionSetManagement, final SoftwareManagement softwareManagement,
             final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java
index 70da2b0b1..83e70ed7f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetTableHeader.java
@@ -37,7 +37,7 @@ public class DistributionSetTableHeader extends AbstractTableHeader {
 
     private final DistributionAddUpdateWindowLayout addUpdateWindowLayout;
 
-    public DistributionSetTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
+    DistributionSetTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
             final ManageDistUIState manageDistUIstate, final DistributionAddUpdateWindowLayout addUpdateWindowLayout) {
         super(i18n, permChecker, eventbus, null, manageDistUIstate, null);
         this.addUpdateWindowLayout = addUpdateWindowLayout;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
index ec73cd4bc..2d7b459eb 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/footer/DistributionsConfirmationWindowLayout.java
@@ -79,7 +79,7 @@ public class DistributionsConfirmationWindowLayout extends AbstractConfirmationW
 
     private final ManageDistUIState manageDistUIState;
 
-    public DistributionsConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus,
+    DistributionsConfirmationWindowLayout(final I18N i18n, final UIEventBus eventBus,
             final DistributionSetManagement dsManagement, final SoftwareManagement softwareManagement,
             final ManageDistUIState manageDistUIState) {
         super(i18n, eventBus);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
index 1c088c483..555ea26fe 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
@@ -52,7 +52,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
 
     private final SoftwareModuleMetadatadetailslayout swmMetadataTable;
 
-    public SwModuleDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
+    SwModuleDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
             final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow,
             final ManageDistUIState manageDistUIState, final SoftwareManagement softwareManagement,
             final SwMetadataPopupLayout swMetadataPopupLayout, final EntityFactory entityFactory) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
index de422d78e..8ad3db967 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTable.java
@@ -75,7 +75,7 @@ public class SwModuleTable extends AbstractNamedVersionTable<SoftwareModule, Lon
 
     private final SwMetadataPopupLayout swMetadataPopupLayout;
 
-    public SwModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
+    SwModuleTable(final UIEventBus eventBus, final I18N i18n, final UINotification uiNotification,
             final ManageDistUIState manageDistUIState, final SoftwareManagement softwareManagement,
             final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria,
             final SwMetadataPopupLayout swMetadataPopupLayout, final ArtifactUploadState artifactUploadState) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java
index c5cf9b078..918de2254 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleTableHeader.java
@@ -37,7 +37,7 @@ public class SwModuleTableHeader extends AbstractTableHeader {
 
     private final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow;
 
-    public SwModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
+    SwModuleTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
             final ManageDistUIState manageDistUIstate,
             final SoftwareModuleAddUpdateWindow softwareModuleAddUpdateWindow) {
         super(i18n, permChecker, eventbus, null, manageDistUIstate, null);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java
index e33129f60..2b074eafc 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtonClick.java
@@ -33,7 +33,7 @@ public class DistSMTypeFilterButtonClick extends AbstractFilterSingleButtonClick
 
     private final transient SoftwareManagement softwareManagement;
 
-    public DistSMTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
+    DistSMTypeFilterButtonClick(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
             final SoftwareManagement softwareManagement) {
         this.eventBus = eventBus;
         this.manageDistUIState = manageDistUIState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java
index a587d55f5..ffcba682d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterButtons.java
@@ -46,7 +46,7 @@ public class DistSMTypeFilterButtons extends AbstractFilterButtons {
 
     private final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria;
 
-    public DistSMTypeFilterButtons(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
+    DistSMTypeFilterButtons(final UIEventBus eventBus, final ManageDistUIState manageDistUIState,
             final DistributionsViewAcceptCriteria distributionsViewAcceptCriteria,
             final SoftwareManagement softwareManagement) {
         super(eventBus, new DistSMTypeFilterButtonClick(eventBus, manageDistUIState, softwareManagement));
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java
index cb5eb6167..3ee98a6aa 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/DistSMTypeFilterHeader.java
@@ -36,7 +36,7 @@ public class DistSMTypeFilterHeader extends AbstractFilterHeader {
     private final ManageDistUIState manageDistUIState;
     private final CreateUpdateSoftwareTypeLayout createUpdateSWTypeLayout;
 
-    public DistSMTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
+    DistSMTypeFilterHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventBus,
             final ManageDistUIState manageDistUIState, final TagManagement tagManagement,
             final EntityFactory entityFactory, final UINotification uiNotification,
             final SoftwareManagement swTypeManagementService) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
index 5d81771ec..d8861811f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java
@@ -223,7 +223,7 @@ public class AutoCompleteTextFieldComponent extends HorizontalLayout {
     class StatusCircledAsync implements Runnable {
         private final UI current;
 
-        public StatusCircledAsync(final UI current) {
+        StatusCircledAsync(final UI current) {
             this.current = current;
         }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
index fc55ce393..57db63103 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
@@ -105,7 +105,7 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
 
     private LayoutClickListener nameLayoutClickListner;
 
-    public CreateOrUpdateFilterHeader(final I18N i18n, final UIEventBus eventBus,
+    CreateOrUpdateFilterHeader(final I18N i18n, final UIEventBus eventBus,
             final FilterManagementUIState filterManagementUIState,
             final TargetFilterQueryManagement targetFilterQueryManagement, final SpPermissionChecker permissionChecker,
             final UINotification notification, final UiProperties uiProperties, final EntityFactory entityFactory,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
index 052523be3..d5ff7f242 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
@@ -66,7 +66,7 @@ public class CreateOrUpdateFilterTable extends Table {
 
     private static final String INSTALL_DIST_SET = "installedDistributionSet";
 
-    public CreateOrUpdateFilterTable(final I18N i18n, final UIEventBus eventBus,
+    CreateOrUpdateFilterTable(final I18N i18n, final UIEventBus eventBus,
             final FilterManagementUIState filterManagementUIState) {
         this.i18n = i18n;
         this.filterManagementUIState = filterManagementUIState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java
index 1633d629b..1b01a8a5b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectTable.java
@@ -46,8 +46,7 @@ public class DistributionSetSelectTable extends Table {
 
     private Container container;
 
-    public DistributionSetSelectTable(final I18N i18n, final UIEventBus eventBus,
-            final ManageDistUIState manageDistUIState) {
+    DistributionSetSelectTable(final I18N i18n, final UIEventBus eventBus, final ManageDistUIState manageDistUIState) {
         this.i18n = i18n;
         this.manageDistUIState = manageDistUIState;
         setStyleName("sp-table");
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java
index 57e8004ad..72948667a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/DistributionSetSelectWindow.java
@@ -62,9 +62,8 @@ public class DistributionSetSelectWindow
     private CheckBox checkBox;
     private Long tfqId;
 
-    public DistributionSetSelectWindow(final I18N i18n, final UIEventBus eventBus,
-            final TargetManagement targetManagement, final TargetFilterQueryManagement targetFilterQueryManagement,
-            final ManageDistUIState manageDistUIState) {
+    DistributionSetSelectWindow(final I18N i18n, final UIEventBus eventBus, final TargetManagement targetManagement,
+            final TargetFilterQueryManagement targetFilterQueryManagement, final ManageDistUIState manageDistUIState) {
         this.i18n = i18n;
         this.dsTable = new DistributionSetSelectTable(i18n, eventBus, manageDistUIState);
         this.eventBus = eventBus;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java
index 0165b0247..d61d53a95 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryHeader.java
@@ -40,7 +40,7 @@ public class ActionHistoryHeader extends VerticalLayout {
     private Label titleOfActionHistory;
     private SPUIButton maxMinButton;
 
-    public ActionHistoryHeader(final UIEventBus eventBus, final ManagementUIState managementUIState) {
+    ActionHistoryHeader(final UIEventBus eventBus, final ManagementUIState managementUIState) {
         this.eventBus = eventBus;
         this.managementUIState = managementUIState;
         buildComponent();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
index deae7ca37..92acf29a7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryTable.java
@@ -85,8 +85,8 @@ public class ActionHistoryTable extends TreeTable {
 
     private Target target;
 
-    public ActionHistoryTable(final I18N i18n, final DeploymentManagement deploymentManagement,
-            final UIEventBus eventBus, final UINotification notification, final ManagementUIState managementUIState) {
+    ActionHistoryTable(final I18N i18n, final DeploymentManagement deploymentManagement, final UIEventBus eventBus,
+            final UINotification notification, final ManagementUIState managementUIState) {
         this.i18n = i18n;
         this.deploymentManagement = deploymentManagement;
         this.eventBus = eventBus;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
index 47adfd03a..16da19b01 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
@@ -48,13 +48,12 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
     private final DistributionTagToken distributionTagToken;
     private final DistributionSetManagement distributionSetManagement;
     private final DsMetadataPopupLayout dsMetadataPopupLayout;
-    private final EntityFactory entityFactory;
 
     private final SoftwareModuleDetailsTable softwareModuleTable;
 
     private final DistributionSetMetadatadetailslayout dsMetadataTable;
 
-    public DistributionDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
+    DistributionDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
             final ManagementUIState managementUIState, final DistributionSetManagement distributionSetManagement,
             final DsMetadataPopupLayout dsMetadataPopupLayout, final EntityFactory entityFactory,
             final UINotification notificationMessage, final SystemManagement systemManagement,
@@ -67,7 +66,6 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
         this.distributionSetManagement = distributionSetManagement;
         this.dsMetadataPopupLayout = new DsMetadataPopupLayout(i18n, notificationMessage, eventBus,
                 distributionSetManagement, entityFactory, permissionChecker);
-        this.entityFactory = entityFactory;
         this.distributionAddUpdateWindowLayout = distributionAddUpdateWindowLayout;
 
         softwareModuleTable = new SoftwareModuleDetailsTable(i18n, false, permissionChecker, null, null, null);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
index 77684b82b..f287a82d6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTable.java
@@ -90,7 +90,7 @@ public class DistributionTable extends AbstractNamedVersionTable<DistributionSet
     private boolean isDistPinned;
     private Button distributinPinnedBtn;
 
-    public DistributionTable(final UIEventBus eventBus, final I18N i18n, final SpPermissionChecker permissionChecker,
+    DistributionTable(final UIEventBus eventBus, final I18N i18n, final SpPermissionChecker permissionChecker,
             final UINotification notification, final ManagementUIState managementUIState,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria, final TargetManagement targetService,
             final DsMetadataPopupLayout dsMetadataPopupLayout,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java
index bd617d2a4..7acaaeb0f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionTableHeader.java
@@ -36,7 +36,7 @@ public class DistributionTableHeader extends AbstractTableHeader {
 
     private final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout;
 
-    public DistributionTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
+    DistributionTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
             final ManagementUIState managementUIState,
             final DistributionAddUpdateWindowLayout distributionAddUpdateWindowLayout) {
         super(i18n, permChecker, eventbus, managementUIState, null, null);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
index d666c4a5c..af6be8c4e 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
@@ -42,7 +42,7 @@ public class CreateUpdateDistributionTagLayoutWindow extends AbstractCreateUpdat
     private static final String TARGET_TAG_NAME_DYNAMIC_STYLE = "new-target-tag-name";
     private static final String MSG_TEXTFIELD_NAME = "textfield.name";
 
-    public CreateUpdateDistributionTagLayoutWindow(final I18N i18n, final TagManagement tagManagement,
+    CreateUpdateDistributionTagLayoutWindow(final I18N i18n, final TagManagement tagManagement,
             final EntityFactory entityFactory, final UIEventBus eventBus, final SpPermissionChecker permChecker,
             final UINotification uiNotification) {
         super(i18n, tagManagement, entityFactory, eventBus, permChecker, uiNotification);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java
index 2b5f9d597..cb8af21a5 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtonClick.java
@@ -27,7 +27,7 @@ public class DistributionTagButtonClick extends AbstractFilterMultiButtonClick {
     private final transient EventBus.UIEventBus eventBus;
     private final ManagementUIState managementUIState;
 
-    public DistributionTagButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState) {
+    DistributionTagButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState) {
         this.eventBus = eventBus;
         this.managementUIState = managementUIState;
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
index 0f554375c..ff2db94f7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
@@ -54,7 +54,7 @@ public class DistributionTagButtons extends AbstractFilterButtons {
     private final ManagementUIState managementUIState;
     private final EntityFactory entityFactory;
 
-    public DistributionTagButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
+    DistributionTagButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
             final EntityFactory entityFactory, final I18N i18n, final UINotification notification,
             final SpPermissionChecker permChecker, final DistributionTableFilters distFilterParameters,
             final DistributionSetManagement distributionSetManagement,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java
index 5df22af49..364ed66ca 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagHeader.java
@@ -34,7 +34,7 @@ public class DistributionTagHeader extends AbstractFilterHeader {
     private final ManagementUIState managementUIState;
     private final CreateUpdateDistributionTagLayoutWindow createORUpdateDistributionTagLayout;
 
-    public DistributionTagHeader(final I18N i18n, final ManagementUIState managementUIState,
+    DistributionTagHeader(final I18N i18n, final ManagementUIState managementUIState,
             final SpPermissionChecker permChecker, final UIEventBus eventBus, final TagManagement tagManagement,
             final EntityFactory entityFactory, final UINotification uiNotification) {
         super(permChecker, eventBus, i18n);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
index 17594af3e..8fd1857c6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java
@@ -100,7 +100,7 @@ public class BulkUploadHandler extends CustomComponent
     private transient EntityFactory entityFactory;
     private final UI uiInstance;
 
-    public BulkUploadHandler(final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout,
+    BulkUploadHandler(final TargetBulkUpdateWindowLayout targetBulkUpdateWindowLayout,
             final TargetManagement targetManagement, final ManagementUIState managementUIState,
             final DeploymentManagement deploymentManagement, final I18N i18n, final UI uiInstance) {
         this.uiInstance = uiInstance;
@@ -172,7 +172,7 @@ public class BulkUploadHandler extends CustomComponent
          *
          * @param event
          */
-        public UploadAsync(final SucceededEvent event) {
+        private UploadAsync(final SucceededEvent event) {
             this.event = event;
         }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
index dcf3e0d7a..76302a43a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
@@ -64,8 +64,8 @@ public class TargetAddUpdateWindowLayout extends CustomComponent {
     private FormLayout formLayout;
     private CommonDialogWindow window;
 
-    public TargetAddUpdateWindowLayout(final I18N i18n, final TargetManagement targetManagement,
-            final UIEventBus eventBus, final UINotification uINotification, final EntityFactory entityFactory) {
+    TargetAddUpdateWindowLayout(final I18N i18n, final TargetManagement targetManagement, final UIEventBus eventBus,
+            final UINotification uINotification, final EntityFactory entityFactory) {
         this.i18n = i18n;
         this.targetManagement = targetManagement;
         this.eventBus = eventBus;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java
index 4f640b61f..04e98505c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkTokenTags.java
@@ -26,7 +26,7 @@ import org.vaadin.spring.events.EventBus.UIEventBus;
 public class TargetBulkTokenTags extends AbstractTargetTagToken {
     private static final long serialVersionUID = 4159616629565523717L;
 
-    public TargetBulkTokenTags(final SpPermissionChecker checker, final I18N i18n, final UINotification uinotification,
+    TargetBulkTokenTags(final SpPermissionChecker checker, final I18N i18n, final UINotification uinotification,
             final UIEventBus eventBus, final ManagementUIState managementUIState, final TagManagement tagManagement) {
         super(checker, i18n, uinotification, eventBus, managementUIState, tagManagement);
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
index cea92c80e..c57631bf0 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetBulkUpdateWindowLayout.java
@@ -90,10 +90,10 @@ public class TargetBulkUpdateWindowLayout extends CustomComponent {
     private Button minimizeButton;
     private Button closeButton;
 
-    public TargetBulkUpdateWindowLayout(final I18N i18n, final TargetManagement targetManagement,
-            final UIEventBus eventBus, final ManagementUIState managementUIState,
-            final DeploymentManagement deploymentManagement, final UiProperties uiproperties,
-            final SpPermissionChecker checker, final UINotification uinotification, final TagManagement tagManagement) {
+    TargetBulkUpdateWindowLayout(final I18N i18n, final TargetManagement targetManagement, final UIEventBus eventBus,
+            final ManagementUIState managementUIState, final DeploymentManagement deploymentManagement,
+            final UiProperties uiproperties, final SpPermissionChecker checker, final UINotification uinotification,
+            final TagManagement tagManagement) {
         this.i18n = i18n;
         this.targetManagement = targetManagement;
         this.eventBus = eventBus;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
index ff756c8bd..af6c76307 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
@@ -59,7 +59,7 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
     private VerticalLayout assignedDistLayout;
     private VerticalLayout installedDistLayout;
 
-    public TargetDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
+    TargetDetails(final I18N i18n, final UIEventBus eventBus, final SpPermissionChecker permissionChecker,
             final ManagementUIState managementUIState, final UINotification uiNotification,
             final TagManagement tagManagement, final TargetManagement targetManagement,
             final EntityFactory entityFactory) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java
index fa2e58e42..7e500b257 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetTableHeader.java
@@ -71,7 +71,7 @@ public class TargetTableHeader extends AbstractTableHeader {
 
     private boolean isComplexFilterViewDisplayed;
 
-    public TargetTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
+    TargetTableHeader(final I18N i18n, final SpPermissionChecker permChecker, final UIEventBus eventbus,
             final UINotification notification, final ManagementUIState managementUIState,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria, final TargetManagement targetManagement,
             final DeploymentManagement deploymentManagement, final UiProperties uiproperties, final UIEventBus eventBus,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java
index e00f5183b..42ea4d424 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/FilterByStatusLayout.java
@@ -61,7 +61,7 @@ public class FilterByStatusLayout extends VerticalLayout implements Button.Click
     private Button buttonClicked;
     private static final String BTN_CLICKED = "btnClicked";
 
-    public FilterByStatusLayout(final I18N i18n, final UIEventBus eventBus, final ManagementUIState managementUIState) {
+    FilterByStatusLayout(final I18N i18n, final UIEventBus eventBus, final ManagementUIState managementUIState) {
         this.i18n = i18n;
         this.eventBus = eventBus;
         this.managementUIState = managementUIState;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java
index 267098603..8c8315f40 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/MultipleTargetFilter.java
@@ -56,7 +56,7 @@ public class MultipleTargetFilter extends Accordion implements SelectedTabChange
 
     private Button config;
 
-    public MultipleTargetFilter(final CreateUpdateTargetTagLayoutWindow createUpdateTargetTagLayout,
+    MultipleTargetFilter(final CreateUpdateTargetTagLayoutWindow createUpdateTargetTagLayout,
             final SpPermissionChecker permChecker, final ManagementUIState managementUIState, final I18N i18n,
             final UIEventBus eventBus, final ManagementViewAcceptCriteria managementViewAcceptCriteria,
             final UINotification notification, final EntityFactory entityFactory,
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java
index 5058d78ae..72584c9b6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetFilterQueryButtons.java
@@ -46,7 +46,7 @@ public class TargetFilterQueryButtons extends Table {
 
     private CustomTargetTagFilterButtonClick customTargetTagFilterButtonClick;
 
-    public TargetFilterQueryButtons(final ManagementUIState managementUIState, final UIEventBus eventBus) {
+    TargetFilterQueryButtons(final ManagementUIState managementUIState, final UIEventBus eventBus) {
         this.managementUIState = managementUIState;
         this.eventBus = eventBus;
     }
@@ -56,7 +56,7 @@ public class TargetFilterQueryButtons extends Table {
      * 
      * @param filterButtonClickBehaviour
      */
-    public void init(final CustomTargetTagFilterButtonClick filterButtonClickBehaviour) {
+    void init(final CustomTargetTagFilterButtonClick filterButtonClickBehaviour) {
         this.customTargetTagFilterButtonClick = filterButtonClickBehaviour;
         createTable();
         eventBus.subscribe(this);
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java
index f1d883842..cd08b1c9f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtonClick.java
@@ -31,7 +31,7 @@ public class TargetTagFilterButtonClick extends AbstractFilterMultiButtonClick i
 
     private final ManagementUIState managementUIState;
 
-    public TargetTagFilterButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState) {
+    TargetTagFilterButtonClick(final UIEventBus eventBus, final ManagementUIState managementUIState) {
         this.eventBus = eventBus;
         this.managementUIState = managementUIState;
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
index 20d68ed55..610bc4472 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
@@ -73,7 +73,7 @@ public class TargetTagFilterButtons extends AbstractFilterButtons {
 
     private final TargetManagement targetManagement;
 
-    public TargetTagFilterButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
+    TargetTagFilterButtons(final UIEventBus eventBus, final ManagementUIState managementUIState,
             final ManagementViewAcceptCriteria managementViewAcceptCriteria, final I18N i18n,
             final UINotification notification, final SpPermissionChecker permChecker, final EntityFactory entityFactory,
             final TargetManagement targetManagement) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java
index da8a1482f..e579b3372 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterHeader.java
@@ -26,14 +26,12 @@ public class TargetTagFilterHeader extends AbstractFilterHeader {
     private static final long serialVersionUID = 3046367045669148009L;
 
     private final ManagementUIState managementUIState;
-    private final CreateUpdateTargetTagLayoutWindow createUpdateTargetTagLayout;
 
-    public TargetTagFilterHeader(final I18N i18n, final CreateUpdateTargetTagLayoutWindow createUpdateTargetTagLayout,
+    TargetTagFilterHeader(final I18N i18n, final CreateUpdateTargetTagLayoutWindow createUpdateTargetTagLayout,
             final ManagementUIState managementUIState, final SpPermissionChecker permChecker,
             final UIEventBus eventBus) {
         super(permChecker, eventBus, i18n);
         this.managementUIState = managementUIState;
-        this.createUpdateTargetTagLayout = createUpdateTargetTagLayout;
         if (permChecker.hasCreateTargetPermission() || permChecker.hasUpdateTargetPermission()) {
             createUpdateTargetTagLayout.init();
         }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java
index 6971ea6b4..20fd85808 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java
@@ -24,14 +24,14 @@ public class GravatarResource extends ExternalResource {
 
     /**
      * Construct based on given email address. Generates external resource
-     * pointing to gravatar with rating
-     * "g: suitable for display on all websites with any audience type." and
-     * "mystery-man" icon as backup as secure request.
+     * pointing to gravatar with rating "g: suitable for display on all websites
+     * with any audience type." and "mystery-man" icon as backup as secure
+     * request.
      * 
      * @param email
      *            to generate resource for
      */
-    public GravatarResource(final String email) {
+    GravatarResource(final String email) {
         super("https://www.gravatar.com/avatar/" + DigestUtils.md5DigestAsHex(email.getBytes()) + ".jpg?s=56&r=g&d=mm");
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/StatusFontIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/StatusFontIcon.java
index 9ab22a6b1..cfd1e63dd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/StatusFontIcon.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/StatusFontIcon.java
@@ -25,7 +25,7 @@ public class StatusFontIcon {
     final FontAwesome fontIcon;
     final String style;
 
-    public StatusFontIcon(FontAwesome fontIcon, String style) {
+    public StatusFontIcon(final FontAwesome fontIcon, final String style) {
         super();
         this.fontIcon = fontIcon;
         this.style = style;
@@ -39,4 +39,4 @@ public class StatusFontIcon {
         return style;
     }
 
-}
\ No newline at end of file
+}
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
index c2821a57f..7cd6e6481 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
@@ -128,10 +128,9 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
 
     private final NullValidator nullValidator = new NullValidator(null, false);
 
-    public AddUpdateRolloutWindowLayout(final RolloutManagement rolloutManagement,
-            final TargetManagement targetManagement, final UINotification uiNotification,
-            final UiProperties uiProperties, final EntityFactory entityFactory, final I18N i18n,
-            final UIEventBus eventBus) {
+    AddUpdateRolloutWindowLayout(final RolloutManagement rolloutManagement, final TargetManagement targetManagement,
+            final UINotification uiNotification, final UiProperties uiProperties, final EntityFactory entityFactory,
+            final I18N i18n, final UIEventBus eventBus) {
         this.actionTypeOptionGroupLayout = new ActionTypeOptionGroupLayout(i18n);
         this.rolloutManagement = rolloutManagement;
         this.targetManagement = targetManagement;
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
index 3fe5ff862..e991af6fa 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
@@ -127,7 +127,7 @@ public class RolloutListGrid extends AbstractGrid {
                 new StatusFontIcon(FontAwesome.EXCLAMATION_CIRCLE, SPUIStyleDefinitions.STATUS_ICON_RED));
     }
 
-    public RolloutListGrid(final I18N i18n, final UIEventBus eventBus, final RolloutManagement rolloutManagement,
+    RolloutListGrid(final I18N i18n, final UIEventBus eventBus, final RolloutManagement rolloutManagement,
             final UINotification uiNotification, final RolloutUIState rolloutUIState,
             final SpPermissionChecker permissionChecker, final TargetManagement targetManagement,
             final EntityFactory entityFactory, final UiProperties uiProperties) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java
index 3978da017..074452c43 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListHeader.java
@@ -40,7 +40,7 @@ public class RolloutListHeader extends AbstractGridHeader {
 
     private final AddUpdateRolloutWindowLayout addUpdateRolloutWindow;
 
-    public RolloutListHeader(final SpPermissionChecker permissionChecker, final RolloutUIState rolloutUIState,
+    RolloutListHeader(final SpPermissionChecker permissionChecker, final RolloutUIState rolloutUIState,
             final UIEventBus eventBus, final RolloutManagement rolloutManagement,
             final TargetManagement targetManagement, final UINotification uiNotification,
             final UiProperties uiProperties, final EntityFactory entityFactory, final I18N i18n) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
index 676a499ce..fbeac2502 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
@@ -55,8 +55,7 @@ public class AuthenticationConfigurationView extends BaseConfigurationView
 
     private CheckBox downloadAnonymousCheckBox;
 
-    public AuthenticationConfigurationView(final I18N i18n,
-            final TenantConfigurationManagement tenantConfigurationManagement,
+    AuthenticationConfigurationView(final I18N i18n, final TenantConfigurationManagement tenantConfigurationManagement,
             final SecurityTokenGenerator securityTokenGenerator) {
         this.i18n = i18n;
         this.certificateAuthenticationConfigurationItem = new CertificateAuthenticationConfigurationItem(
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java
index c3753e1a7..d435f74c6 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java
@@ -33,11 +33,7 @@ public class DefaultDistributionSetTypeLayout extends BaseConfigurationView impl
 
     private static final long serialVersionUID = 17896542758L;
 
-    private final SystemManagement systemManagement;
-
-    private final DistributionSetManagement distributionSetManagement;
-
-    private final I18N i18n;
+    private final transient SystemManagement systemManagement;
 
     private Long currentDefaultDisSetType;
 
@@ -49,11 +45,9 @@ public class DefaultDistributionSetTypeLayout extends BaseConfigurationView impl
 
     private final Label changeIcon;
 
-    public DefaultDistributionSetTypeLayout(final SystemManagement systemManagement,
+    DefaultDistributionSetTypeLayout(final SystemManagement systemManagement,
             final DistributionSetManagement distributionSetManagement, final I18N i18n) {
         this.systemManagement = systemManagement;
-        this.distributionSetManagement = distributionSetManagement;
-        this.i18n = i18n;
 
         final Panel rootPanel = new Panel();
         rootPanel.setSizeFull();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java
index 2c55f2c8f..ee00568ad 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java
@@ -38,7 +38,7 @@ public class PollingConfigurationView extends BaseConfigurationView
     private Duration tenantPollTime;
     private Duration tenantOverdueTime;
 
-    public PollingConfigurationView(final I18N i18n, final ControllerPollProperties controllerPollProperties,
+    PollingConfigurationView(final I18N i18n, final ControllerPollProperties controllerPollProperties,
             final TenantConfigurationManagement tenantConfigurationManagement) {
         this.tenantConfigurationManagement = tenantConfigurationManagement;
 
@@ -130,7 +130,7 @@ public class PollingConfigurationView extends BaseConfigurationView
         notifyConfigurationChanged();
     }
 
-    private boolean compareDurations(final Duration d1, final Duration d2) {
+    private static boolean compareDurations(final Duration d1, final Duration d2) {
         if (d1 == null && d2 == null) {
             return true;
         }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
index df8cf27d6..1d1687dda 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
@@ -199,7 +199,7 @@ public final class SPDateTimeUtil {
         /**
          * 
          */
-        private CalendarI18N(final String single, final String plural) {
+        CalendarI18N(final String single, final String plural) {
             this.single = single;
             this.plural = plural;
         }