--- a/taskcluster/ci/android-stuff/kind.yml
+++ b/taskcluster/ci/android-stuff/kind.yml
@@ -67,19 +67,16 @@ jobs:
               - "testing/mozharness/configs/builds/releng_sub_android_configs/*gradle_dependencies.py"
               - "**/*.gradle"
 
     android-test:
         description: "Android armv7 unit tests"
         attributes:
             build_platform: android-test
             build_type: opt
-        index:
-            product: mobile
-            job-name: android-test-opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
             kind: build
             tier: 2
             symbol: tc(test)
         worker-type: aws-provisioner-v1/android-api-15
         worker:
             implementation: docker-worker
@@ -121,19 +118,16 @@ jobs:
               - "mobile/android/base/**"
               - "mobile/android/tests/background/junit4/**"
 
     android-lint:
         description: "Android lint"
         attributes:
             build_platform: android-lint
             build_type: opt
-        index:
-            product: mobile
-            job-name: android-lint-opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
             kind: build
             tier: 2
             symbol: tc(lint)
         worker-type: aws-provisioner-v1/android-api-15
         worker:
             implementation: docker-worker
@@ -186,19 +180,16 @@ jobs:
               - "mobile/android/**/*.xml" # Manifest & android resources
               - "mobile/android/**/build.gradle"
 
     android-checkstyle:
         description: "Android checkstyle"
         attributes:
             build_platform: android-checkstyle
             build_type: opt
-        index:
-            product: mobile
-            job-name: android-checkstyle-opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
             kind: build
             tier: 2
             symbol: tc(checkstyle)
         worker-type: aws-provisioner-v1/android-api-15
         worker:
             implementation: docker-worker

--- a/taskcluster/ci/marionette-harness/kind.yml
+++ b/taskcluster/ci/marionette-harness/kind.yml
@@ -14,20 +14,16 @@ transforms:
 # with a run.using of "mozharness", and combined with the source-check kind.
 
 jobs:
     marionette-harness/opt:
         description: "Marionette harness unit test"
         attributes:
             build_platform: marionette-harness
             build_type: opt
-        index:
-            product: harness_test
-            job-name:
-                gecko-v2: marionette-harness-pytest-opt
         treeherder:
             platform: linux64/opt
             kind: test
             tier: 2
             symbol: tc(Mn-h)
         worker-type: aws-provisioner-v1/desktop-test-xlarge
         worker:
             implementation: docker-worker

--- a/taskcluster/ci/source-check/doc.yml
+++ b/taskcluster/ci/source-check/doc.yml
@@ -1,14 +1,10 @@
 sphinx/opt:
     description: Generate the Sphinx documentation
-    index:
-        product: lint
-        job-name:
-            gecko-v2: sphinx-opt
     treeherder:
         symbol: tc(Doc)
         kind: test
         tier: 1
         platform: lint/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker

--- a/taskcluster/ci/source-check/mozlint.yml
+++ b/taskcluster/ci/source-check/mozlint.yml
@@ -1,14 +1,10 @@
 mozlint-eslint/opt:
     description: JS lint check
-    index:
-        product: lint
-        job-name:
-            gecko-v2: eslint-gecko-opt
     treeherder:
         symbol: ES
         kind: test
         tier: 1
         platform: lint/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker
@@ -43,20 +39,16 @@ mozlint-eslint/opt:
             - 'tools/lint/eslint/eslint-plugin-mozilla/**'
             # Other misc lint related files.
             - 'python/mozlint/**'
             - 'tools/lint/**'
             - 'testing/docker/lint/**'
 
 mozlint-flake8/opt:
     description: flake8 run over the gecko codebase
-    index:
-        product: lint
-        job-name:
-            gecko-v2: mozlint-flake8-opt
     treeherder:
         symbol: f8
         kind: test
         tier: 2
         platform: lint/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker
@@ -73,20 +65,16 @@ mozlint-flake8/opt:
             - '**/*.py'
             - '**/.flake8'
             - 'python/mozlint/**'
             - 'tools/lint/**'
             - 'testing/docker/lint/**'
 
 wptlint-gecko/opt:
     description: web-platform-tests linter
-    index:
-        product: lint
-        job-name:
-            gecko-v2: wpt-lint-gecko-opt
     treeherder:
         symbol: W
         kind: test
         tier: 2
         platform: lint/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker

--- a/taskcluster/ci/source-check/python-tests.yml
+++ b/taskcluster/ci/source-check/python-tests.yml
@@ -1,14 +1,10 @@
 taskgraph-tests/opt:
     description: taskcluster/taskgraph unit tests
-    index:
-        product: lint
-        job-name:
-            gecko-v2: taskgraph-tests-opt
     treeherder:
         symbol: tg
         kind: test
         tier: 2
         platform: linux64/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker
@@ -23,20 +19,16 @@ taskgraph-tests/opt:
     when:
         files-changed:
             - 'taskcluster/**/*.py'
             - 'config/mozunit.py'
             - 'python/mach/**/*.py'
 
 mozharness/opt:
     description: mozharness integration tests
-    index:
-        product: lint
-        job-name:
-            gecko-v2: mozharness-tox-opt
     treeherder:
         symbol: MH
         kind: test
         tier: 2
         platform: lint/opt
     worker-type: aws-provisioner-v1/b2gtest
     worker:
         implementation: docker-worker

--- a/taskcluster/ci/toolchain/kind.yml
+++ b/taskcluster/ci/toolchain/kind.yml
@@ -18,35 +18,27 @@ job-defaults:
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         docker-image: {in-tree: desktop-build}
         max-run-time: 36000
 
 jobs:
     linux64-clang/opt:
-        index:
-            product: firefox
-            job-name:
-                gecko-v2: linux64-clang-opt
         treeherder:
             symbol: Cc(Clang)
         run:
             using: toolchain-script
             script: build-clang-linux.sh
         when:
             files-changed:
                 - 'build/build-clang/**'
                 - 'taskcluster/scripts/misc/build-clang-linux.sh'
 
     linux64-gcc/opt:
-        index:
-            product: firefox
-            job-name:
-                gecko-v2: linux64-gcc-opt
         treeherder:
             symbol: Cc(GCC)
         run:
             using: toolchain-script
             script: build-gcc-linux.sh
         when:
             files-changed:
                 - 'build/unix/build-gcc/**'

--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -78,18 +78,17 @@ task_description_schema = Schema({
         # treeherder environments (defaults to both staging and production)
         Required('environments', default=['production', 'staging']): ['production', 'staging'],
     },
 
     # information for indexing this build so its artifacts can be discovered;
     # if omitted, the build will not be indexed.
     Optional('index'): {
         # the name of the product this build produces
-        # TODO: remove lint, harnesss-test when not used
-        'product': Any('firefox', 'mobile', 'b2g', 'lint', 'harness_test'),
+        'product': Any('firefox', 'mobile', 'b2g'),
 
         # the names to use for this job in the TaskCluster index
         'job-name': Any(
             # Assuming the job is named "normally", this is the v2 job name,
             # and the v1 and buildbot routes will be determined appropriately.
             basestring,
 
             # otherwise, give separate names for each of the legacy index