diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures
index 5b05546ad0..4cade7910f 100644
--- a/hack/.staticcheck_failures
+++ b/hack/.staticcheck_failures
@@ -13,16 +13,8 @@ nodeup/pkg/model
 pkg/apis/kops/v1alpha1
 pkg/apis/kops/v1alpha2
 pkg/apis/kops/validation
-pkg/client/simple/api
-pkg/diff
 pkg/instancegroups
-pkg/model
-pkg/model/alimodel
 pkg/model/components
-pkg/model/components/etcdmanager
-pkg/model/gcemodel
-pkg/model/openstackmodel
-pkg/model/spotinstmodel
 pkg/resources/ali
 pkg/resources/aws
 pkg/resources/digitalocean
diff --git a/pkg/client/simple/api/clientset.go b/pkg/client/simple/api/clientset.go
index 7279d728fe..3e4660fe6e 100644
--- a/pkg/client/simple/api/clientset.go
+++ b/pkg/client/simple/api/clientset.go
@@ -177,8 +177,3 @@ func restNamespaceForClusterName(clusterName string) string {
 	namespace := strings.Replace(clusterName, ".", "-", -1)
 	return namespace
 }
-
-func restNamespaceForFederationName(clusterName string) string {
-	namespace := strings.Replace(clusterName, ".", "-", -1)
-	return namespace
-}
diff --git a/pkg/diff/diff_test.go b/pkg/diff/diff_test.go
index 3c7b3756bb..352c783bb1 100644
--- a/pkg/diff/diff_test.go
+++ b/pkg/diff/diff_test.go
@@ -162,7 +162,7 @@ F`
 		diffs := dmp.DiffMain(l, r, false)
 
 		// We do need to cleanup, as otherwise we get some spurious changes on complex diffs
-		diffs = dmp.DiffCleanupSemantic(diffs)
+		dmp.DiffCleanupSemantic(diffs)
 
 	}
 
diff --git a/pkg/model/firewall_test.go b/pkg/model/firewall_test.go
index 1788b07252..997f01eb1c 100644
--- a/pkg/model/firewall_test.go
+++ b/pkg/model/firewall_test.go
@@ -60,12 +60,3 @@ func Test_SharedGroups(t *testing.T) {
 		}
 	}
 }
-
-func makeTestInstanceGroupSec(role kops.InstanceGroupRole, secGroup *string) *kops.InstanceGroup {
-	return &kops.InstanceGroup{
-		Spec: kops.InstanceGroupSpec{
-			Role:                  role,
-			SecurityGroupOverride: secGroup,
-		},
-	}
-}
diff --git a/pkg/model/gcemodel/convenience.go b/pkg/model/gcemodel/convenience.go
index bc40e8f946..2fb6f6d537 100644
--- a/pkg/model/gcemodel/convenience.go
+++ b/pkg/model/gcemodel/convenience.go
@@ -27,8 +27,3 @@ func s(v string) *string {
 func i64(v int64) *int64 {
 	return fi.Int64(v)
 }
-
-// i32 is a helper that builds a *int32 from an int32 value
-func i32(v int32) *int32 {
-	return fi.Int32(v)
-}
diff --git a/pkg/model/network.go b/pkg/model/network.go
index 6fa0cb6b6a..c8103831ca 100644
--- a/pkg/model/network.go
+++ b/pkg/model/network.go
@@ -98,6 +98,7 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		}
 	}
 
+	// TODO: would be good to create these as shared, to verify them
 	if !sharedVPC {
 		dhcp := &awstasks.DHCPOptions{
 			Name:              s(b.ClusterName()),
@@ -120,8 +121,6 @@ func (b *NetworkModelBuilder) Build(c *fi.ModelBuilderContext) error {
 			VPC:         b.LinkToVPC(),
 			DHCPOptions: dhcp,
 		})
-	} else {
-		// TODO: would be good to create these as shared, to verify them
 	}
 
 	allSubnetsUnmanaged := true