diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
index 465fec236..5d8e1edbe 100644
--- a/.github/workflows/golangci-lint.yaml
+++ b/.github/workflows/golangci-lint.yaml
@@ -32,7 +32,6 @@ jobs:
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          # TODO: remove --skip-files once logic is implemented
           # NO_FUTURE args from https://github.com/golangci/golangci-lint-action/issues/119
           args: >
             --out-${NO_FUTURE}format colored-line-number -E gosec --timeout=6m --skip-files
diff --git a/api/v1alpha1/lvmcluster_types.go b/api/v1alpha1/lvmcluster_types.go
index 76d6f0e09..9198e12ea 100644
--- a/api/v1alpha1/lvmcluster_types.go
+++ b/api/v1alpha1/lvmcluster_types.go
@@ -82,11 +82,6 @@ type DeviceClass struct {
 	// +optional
 	NodeSelector *corev1.NodeSelector `json:"nodeSelector,omitempty"`
 
-	// TODO: add support for various LVM settings
-	// // Config for this deviceClass, lvm settings are a field here
-	// // +optional
-	// Config *DeviceClassConfig `json:"config,omitempty"`
-
 	// ThinPoolConfig contains configurations for the thin-pool
 	// +kubebuilder:validation:Required
 	// +required
diff --git a/api/v1alpha1/lvmvolumegroup_types.go b/api/v1alpha1/lvmvolumegroup_types.go
index c46fa02c5..2766f6a47 100644
--- a/api/v1alpha1/lvmvolumegroup_types.go
+++ b/api/v1alpha1/lvmvolumegroup_types.go
@@ -33,11 +33,6 @@ type LVMVolumeGroupSpec struct {
 	// +optional
 	NodeSelector *corev1.NodeSelector `json:"nodeSelector,omitempty"`
 
-	// TODO: add support for various LVM settings
-	// // Config for this deviceClass, lvm settings are a field here
-	// // +optional
-	// Config *DeviceClassConfig `json:"config,omitempty"`
-
 	// ThinPoolConfig contains configurations for the thin-pool
 	// +kubebuilder:validation:Required
 	// +required
diff --git a/controllers/lvmcluster_controller.go b/controllers/lvmcluster_controller.go
index 9e87f3124..fed82a5e9 100644
--- a/controllers/lvmcluster_controller.go
+++ b/controllers/lvmcluster_controller.go
@@ -96,10 +96,6 @@ type LVMClusterReconciler struct {
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
-// TODO(user): Modify the Reconcile function to compare the state specified by
-// the LVMCluster object against the actual cluster state, and then
-// perform operations to make the cluster state reflect the state specified by
-// the user.
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.10.0/pkg/reconcile
diff --git a/controllers/topolvm_controller.go b/controllers/topolvm_controller.go
index 82e5f528d..17ed83114 100644
--- a/controllers/topolvm_controller.go
+++ b/controllers/topolvm_controller.go
@@ -126,7 +126,6 @@ func getControllerDeployment(lvmCluster *lvmv1alpha1.LVMCluster, namespace strin
 		{Name: "certs", VolumeSource: corev1.VolumeSource{EmptyDir: &corev1.EmptyDirVolumeSource{}}},
 	}
 
-	// TODO: Remove custom generation of TLS certs, current it's being used in topolvm controller manager
 	initContainers := []corev1.Container{
 		initContainer(initImage),
 	}
diff --git a/pkg/vgmanager/lvm.go b/pkg/vgmanager/lvm.go
index 66991c968..5d998196c 100644
--- a/pkg/vgmanager/lvm.go
+++ b/pkg/vgmanager/lvm.go
@@ -152,7 +152,6 @@ func (vg VolumeGroup) Delete(exec internal.Executor) error {
 func GetVolumeGroup(exec internal.Executor, name string) (*VolumeGroup, error) {
 	res := new(vgsOutput)
 
-	// TODO: Check if `vgs <vg_name> --reportformat json` can be used to filter out the exact volume group name.
 	args := []string{
 		"vgs", "--units", "g", "--reportformat", "json",
 	}