diff --git a/.golangci.yml b/.golangci.yml
index 2326c47f..c0296b0f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -53,4 +53,5 @@ linters:
     - varcheck
     - wastedassign
     - whitespace
+    - unparam
   disable-all: true
diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go
index a279b3eb..90d2895d 100644
--- a/pkg/repo/repo.go
+++ b/pkg/repo/repo.go
@@ -469,7 +469,7 @@ func (r *repository) cleanupBranch(ctx context.Context, branchName *string, ap A
 	}
 	// now, we are on default and need to delete branchToCleanup. First, delete on remote.
 	localBranchRef := plumbing.NewBranchReferenceName(branchToCleanup)
-	if err := r.repo.Push(&git.PushOptions{
+	if err := r.repo.PushContext(ctx, &git.PushOptions{
 		RemoteName: RemoteName,
 		// Note: the fact that the source ref is empty means this is a delete. This is
 		// equivalent to doing `git push origin --delete <branch_name> on the cmd line.
diff --git a/pkg/star/static/traverse_test.go b/pkg/star/static/traverse_test.go
index 6c3f9fb8..ed422ea7 100644
--- a/pkg/star/static/traverse_test.go
+++ b/pkg/star/static/traverse_test.go
@@ -25,7 +25,7 @@ import (
 )
 
 func testFile(t *testing.T) *build.File {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	p := butils.GetParser(InputTypeAuto)
 	file, err := p("test.star", starBytes)
 	require.NoError(t, err, "failed to parse test star file")
@@ -33,7 +33,7 @@ func testFile(t *testing.T) *build.File {
 }
 
 func TestTraverseNoop(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	f := testFile(t)
 	tvs := newTraverser(f)
 	err := tvs.traverse()
diff --git a/pkg/star/static/walk_test.go b/pkg/star/static/walk_test.go
index 70141c62..7046a883 100644
--- a/pkg/star/static/walk_test.go
+++ b/pkg/star/static/walk_test.go
@@ -73,9 +73,9 @@ func typedVals(t *testing.T, ft feature.FeatureType) (defaultVal testVal, ruleVa
 	return
 }
 
-func testStar(t *testing.T, ft feature.FeatureType) (testVal, testVal, []byte) {
+func testStar(t *testing.T, ft feature.FeatureType) (testVal, []byte) {
 	val, ruleVal := typedVals(t, ft)
-	return val, ruleVal, []byte(fmt.Sprintf(`result = feature(
+	return val, []byte(fmt.Sprintf(`result = feature(
     description = "this is a simple feature",
     default = %s,
     rules = [
@@ -98,7 +98,7 @@ func testWalker(t *testing.T, testStar []byte) *walker {
 }
 
 func TestWalkerBuild(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -106,7 +106,7 @@ func TestWalkerBuild(t *testing.T) {
 }
 
 func TestWalkerBuildJSON(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeJSON)
+	_, starBytes := testStar(t, feature.FeatureTypeJSON)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -116,7 +116,7 @@ func TestWalkerBuildJSON(t *testing.T) {
 func TestWalkerMutateNoop(t *testing.T) {
 	for _, fType := range parsableFeatureTypes {
 		t.Run(string(fType), func(t *testing.T) {
-			_, _, starBytes := testStar(t, fType)
+			_, starBytes := testStar(t, fType)
 			b := testWalker(t, starBytes)
 			f, err := b.Build()
 			require.NoError(t, err)
@@ -130,7 +130,7 @@ func TestWalkerMutateNoop(t *testing.T) {
 }
 
 func TestWalkerMutateDefault(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -147,7 +147,7 @@ func TestWalkerMutateDefault(t *testing.T) {
 }
 
 func TestWalkerMutateModifyRuleCondition(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -162,7 +162,7 @@ func TestWalkerMutateModifyRuleCondition(t *testing.T) {
 }
 
 func TestWalkerMutateModifyRuleConditionV3(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -177,7 +177,7 @@ func TestWalkerMutateModifyRuleConditionV3(t *testing.T) {
 }
 
 func TestWalkerMutateAddRule(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -240,7 +240,7 @@ func TestWalkerMutateAddFirstRule(t *testing.T) {
 }
 
 func TestWalkerMutateRemoveRule(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeBool)
+	_, starBytes := testStar(t, feature.FeatureTypeBool)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -278,7 +278,7 @@ func TestWalkerMutateRemoveOnlyRule(t *testing.T) {
 func TestWalkerMutateDescription(t *testing.T) {
 	for _, fType := range parsableFeatureTypes {
 		t.Run(string(fType), func(t *testing.T) {
-			_, _, starBytes := testStar(t, fType)
+			_, starBytes := testStar(t, fType)
 			b := testWalker(t, starBytes)
 			f, err := b.Build()
 			require.NoError(t, err)
@@ -294,7 +294,7 @@ func TestWalkerMutateDescription(t *testing.T) {
 }
 
 func TestWalkerMutateTypeMismatch(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeFloat)
+	_, starBytes := testStar(t, feature.FeatureTypeFloat)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -308,7 +308,7 @@ func TestWalkerMutateTypeMismatch(t *testing.T) {
 }
 
 func TestWalkerMutateDefaultFloat(t *testing.T) {
-	val, _, starBytes := testStar(t, feature.FeatureTypeFloat)
+	val, starBytes := testStar(t, feature.FeatureTypeFloat)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -326,7 +326,7 @@ func TestWalkerMutateDefaultFloat(t *testing.T) {
 }
 
 func TestWalkerMutateDefaultInt(t *testing.T) {
-	val, _, starBytes := testStar(t, feature.FeatureTypeInt)
+	val, starBytes := testStar(t, feature.FeatureTypeInt)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -344,7 +344,7 @@ func TestWalkerMutateDefaultInt(t *testing.T) {
 }
 
 func TestWalkerMutateDefaultString(t *testing.T) {
-	val, _, starBytes := testStar(t, feature.FeatureTypeString)
+	val, starBytes := testStar(t, feature.FeatureTypeString)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)
@@ -363,7 +363,7 @@ func TestWalkerMutateDefaultString(t *testing.T) {
 }
 
 func TestWalkerMutateDefaultJSON(t *testing.T) {
-	_, _, starBytes := testStar(t, feature.FeatureTypeJSON)
+	_, starBytes := testStar(t, feature.FeatureTypeJSON)
 	b := testWalker(t, starBytes)
 	f, err := b.Build()
 	require.NoError(t, err)