diff --git a/examples/guestbook/all-in-one/frontend.yaml b/examples/guestbook/all-in-one/frontend.yaml
index 780b5c0d7d2..edcaa5c5d49 100644
--- a/examples/guestbook/all-in-one/frontend.yaml
+++ b/examples/guestbook/all-in-one/frontend.yaml
@@ -10,7 +10,6 @@ spec:
   # an external load-balanced IP for the frontend service.
   # type: LoadBalancer
   ports:
-    # the port that this service should serve on
   - port: 80
   selector:
     app: guestbook
@@ -20,21 +19,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: frontend
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: guestbook
-  #   tier: frontend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 3
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     tier: frontend
   template:
     metadata:
       labels:
@@ -54,7 +40,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access environment variables to find service host
           # info, comment out the 'value: dns' line above, and uncomment the
-          # line below.
+          # line below:
           # value: env
         ports:
         - containerPort: 80
diff --git a/examples/guestbook/all-in-one/guestbook-all-in-one.yaml b/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
index c6675e0eb67..7735c798983 100644
--- a/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
+++ b/examples/guestbook/all-in-one/guestbook-all-in-one.yaml
@@ -8,7 +8,6 @@ metadata:
     role: master
 spec:
   ports:
-    # the port that this service should serve on
   - port: 6379
     targetPort: 6379
   selector:
@@ -20,23 +19,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: redis-master
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: redis
-  #   role: master
-  #   tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 1
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     role: master
-  #     tier: backend
   template:
     metadata:
       labels:
@@ -64,7 +48,6 @@ metadata:
     role: slave
 spec:
   ports:
-    # the port that this service should serve on
   - port: 6379
   selector:
     app: redis
@@ -75,23 +58,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: redis
-  #   role: slave
-  #   tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     role: slave
-  #     tier: backend
   template:
     metadata:
       labels:
@@ -112,7 +80,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access an environment variable to find the master
           # service's host, comment out the 'value: dns' line above, and
-          # uncomment the line below.
+          # uncomment the line below:
           # value: env
         ports:
         - containerPort: 6379
@@ -129,7 +97,6 @@ spec:
   # an external load-balanced IP for the frontend service.
   # type: LoadBalancer
   ports:
-    # the port that this service should serve on
   - port: 80
   selector:
     app: guestbook
@@ -139,21 +106,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: frontend
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: guestbook
-  #   tier: frontend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 3
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     tier: frontend
   template:
     metadata:
       labels:
@@ -173,7 +127,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access environment variables to find service host
           # info, comment out the 'value: dns' line above, and uncomment the
-          # line below.
+          # line below:
           # value: env
         ports:
         - containerPort: 80
diff --git a/examples/guestbook/all-in-one/redis-slave.yaml b/examples/guestbook/all-in-one/redis-slave.yaml
index 88c3a99552e..c076b084c04 100644
--- a/examples/guestbook/all-in-one/redis-slave.yaml
+++ b/examples/guestbook/all-in-one/redis-slave.yaml
@@ -8,7 +8,6 @@ metadata:
     tier: backend
 spec:
   ports:
-    # the port that this service should serve on
   - port: 6379
   selector:
     app: redis
@@ -19,23 +18,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: redis
-  #   role: slave
-  #   tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     role: slave
-  #     tier: backend
   template:
     metadata:
       labels:
@@ -56,7 +40,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access an environment variable to find the master
           # service's host, comment out the 'value: dns' line above, and
-          # uncomment the line below.
+          # uncomment the line below:
           # value: env
         ports:
         - containerPort: 6379
diff --git a/examples/guestbook/frontend-deployment.yaml b/examples/guestbook/frontend-deployment.yaml
index 1d67946f444..1888836b3c0 100644
--- a/examples/guestbook/frontend-deployment.yaml
+++ b/examples/guestbook/frontend-deployment.yaml
@@ -2,21 +2,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: frontend
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: guestbook
-  #   tier: frontend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 3
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     tier: frontend
   template:
     metadata:
       labels:
@@ -36,7 +23,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access environment variables to find service host
           # info, comment out the 'value: dns' line above, and uncomment the
-          # line below.
+          # line below:
           # value: env
         ports:
         - containerPort: 80
diff --git a/examples/guestbook/frontend-service.yaml b/examples/guestbook/frontend-service.yaml
index 72ea61327a7..ee50fd847cf 100644
--- a/examples/guestbook/frontend-service.yaml
+++ b/examples/guestbook/frontend-service.yaml
@@ -10,7 +10,6 @@ spec:
   # an external load-balanced IP for the frontend service.
   # type: LoadBalancer
   ports:
-    # the port that this service should serve on
   - port: 80
   selector:
     app: guestbook
diff --git a/examples/guestbook/legacy/frontend-controller.yaml b/examples/guestbook/legacy/frontend-controller.yaml
index b9b8c40f199..f2f7f1d24dc 100644
--- a/examples/guestbook/legacy/frontend-controller.yaml
+++ b/examples/guestbook/legacy/frontend-controller.yaml
@@ -2,20 +2,8 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: frontend
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-    # app: guestbook
-    # tier: frontend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 3
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   app: guestbook
-  #   tier: frontend
   template:
     metadata:
       labels:
@@ -35,7 +23,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access environment variables to find service host
           # info, comment out the 'value: dns' line above, and uncomment the
-          # line below.
+          # line below:
           # value: env
         ports:
         - containerPort: 80
diff --git a/examples/guestbook/legacy/redis-master-controller.yaml b/examples/guestbook/legacy/redis-master-controller.yaml
index 2b9b8ec7a41..0bdf9761752 100644
--- a/examples/guestbook/legacy/redis-master-controller.yaml
+++ b/examples/guestbook/legacy/redis-master-controller.yaml
@@ -2,22 +2,12 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: redis-master
-  # these labels can be applied automatically 
-  # from the labels in the pod template if not set
   labels:
     app: redis
     role: master
     tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 1
-  # selector can be applied automatically 
-  # from the labels in the pod template if not set
-  # selector:
-  #   app: guestbook
-  #   role: master
-  #   tier: backend
   template:
     metadata:
       labels:
diff --git a/examples/guestbook/legacy/redis-slave-controller.yaml b/examples/guestbook/legacy/redis-slave-controller.yaml
index 1d54a828043..90cbd6981b3 100644
--- a/examples/guestbook/legacy/redis-slave-controller.yaml
+++ b/examples/guestbook/legacy/redis-slave-controller.yaml
@@ -2,22 +2,12 @@ apiVersion: v1
 kind: ReplicationController
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
   labels:
     app: redis
     role: slave
     tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   app: guestbook
-  #   role: slave
-  #   tier: backend
   template:
     metadata:
       labels:
@@ -38,7 +28,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access an environment variable to find the master
           # service's host, comment out the 'value: dns' line above, and
-          # uncomment the line below.
+          # uncomment the line below:
           # value: env
         ports:
         - containerPort: 6379
diff --git a/examples/guestbook/redis-master-deployment.yaml b/examples/guestbook/redis-master-deployment.yaml
index 2ef40abd6f2..3fbcc0f01cc 100644
--- a/examples/guestbook/redis-master-deployment.yaml
+++ b/examples/guestbook/redis-master-deployment.yaml
@@ -2,23 +2,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: redis-master
-  # these labels can be applied automatically 
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: redis
-  #   role: master
-  #   tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 1
-  # selector can be applied automatically 
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     role: master
-  #     tier: backend
   template:
     metadata:
       labels:
diff --git a/examples/guestbook/redis-master-service.yaml b/examples/guestbook/redis-master-service.yaml
index a9db7031280..a484014f1fe 100644
--- a/examples/guestbook/redis-master-service.yaml
+++ b/examples/guestbook/redis-master-service.yaml
@@ -8,7 +8,6 @@ metadata:
     tier: backend
 spec:
   ports:
-    # the port that this service should serve on
   - port: 6379
     targetPort: 6379
   selector:
diff --git a/examples/guestbook/redis-slave-deployment.yaml b/examples/guestbook/redis-slave-deployment.yaml
index 5686961d1c3..2bea4a51345 100644
--- a/examples/guestbook/redis-slave-deployment.yaml
+++ b/examples/guestbook/redis-slave-deployment.yaml
@@ -2,23 +2,8 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
-  # from the labels in the pod template if not set
-  # labels:
-  #   app: redis
-  #   role: slave
-  #   tier: backend
 spec:
-  # this replicas value is default
-  # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
-  # from the labels in the pod template if not set
-  # selector:
-  #   matchLabels:
-  #     app: guestbook
-  #     role: slave
-  #     tier: backend
   template:
     metadata:
       labels:
@@ -39,7 +24,7 @@ spec:
           # If your cluster config does not include a dns service, then to
           # instead access an environment variable to find the master
           # service's host, comment out the 'value: dns' line above, and
-          # uncomment the line below.
+          # uncomment the line below:
           # value: env
         ports:
         - containerPort: 6379
diff --git a/examples/guestbook/redis-slave-service.yaml b/examples/guestbook/redis-slave-service.yaml
index e1f04017140..238fd63fb6a 100644
--- a/examples/guestbook/redis-slave-service.yaml
+++ b/examples/guestbook/redis-slave-service.yaml
@@ -8,7 +8,6 @@ metadata:
     tier: backend
 spec:
   ports:
-    # the port that this service should serve on
   - port: 6379
   selector:
     app: redis