diff --git a/cmd/main.go b/cmd/main.go
index 58ec05c..1aec0b8 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -17,7 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"context"
 	"crypto/tls"
 	"flag"
 	"os"
@@ -160,8 +159,7 @@ func main() {
 		}
 	}
 	//+kubebuilder:scaffold:builder
-
-	ctx := context.TODO() // TODO
+	ctx := ctrl.SetupSignalHandler()
 	if err := jobframework.SetupWorkloadOwnerIndex(ctx, mgr.GetFieldIndexer(), controller.GVK); err != nil {
 		setupLog.Error(err, "Setting up indexes", "GVK", controller.GVK)
 		os.Exit(1)
@@ -177,7 +175,7 @@ func main() {
 	}
 
 	setupLog.Info("starting manager")
-	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+	if err := mgr.Start(ctx); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
 	}
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 6a796c1..adac909 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -36,26 +36,22 @@ spec:
       labels:
         control-plane: controller-manager
     spec:
-      # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution.
-      # It is considered best practice to support multiple architectures. You can
-      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: kubernetes.io/arch
+                operator: In
+                values:
+                - amd64
+                - arm64
+                - ppc64le
+                - s390x
+              - key: kubernetes.io/os
+                operator: In
+                values:
+                - linux
       securityContext:
         runAsNonRoot: true
         # TODO(user): For common cases that do not require escalating privileges
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
deleted file mode 100644
index 73e3829..0000000
--- a/config/samples/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-## Append samples of your project ##
-resources:
-- workload_v1beta2_appwrapper.yaml
-#+kubebuilder:scaffold:manifestskustomizesamples
diff --git a/config/samples/workload_v1beta2_appwrapper.yaml b/config/samples/workload_v1beta2_appwrapper.yaml
deleted file mode 100644
index 8386c87..0000000
--- a/config/samples/workload_v1beta2_appwrapper.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: workload.codeflare.dev/v1beta2
-kind: AppWrapper
-metadata:
-  labels:
-    app.kubernetes.io/name: appwrapper
-    app.kubernetes.io/instance: appwrapper-sample
-    app.kubernetes.io/part-of: appwrapper
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: appwrapper
-  name: appwrapper-sample
-spec:
-# TODO(user): Add fields here
diff --git a/internal/controller/appwrapper_controller.go b/internal/controller/appwrapper_controller.go
index c224323..cad4243 100644
--- a/internal/controller/appwrapper_controller.go
+++ b/internal/controller/appwrapper_controller.go
@@ -330,7 +330,7 @@ func (r *AppWrapperReconciler) createComponents(ctx context.Context, aw *workloa
 }
 
 func (r *AppWrapperReconciler) deleteComponents(ctx context.Context, aw *workloadv1beta2.AppWrapper) bool {
-	// TODO forceful deletion
+	// TODO forceful deletion: See https://github.com/project-codeflare/appwrapper/issues/36
 	log := log.FromContext(ctx)
 	remaining := 0
 	for _, component := range aw.Spec.Components {