From bbad4745d395714a60661602c0d18e640becf736 Mon Sep 17 00:00:00 2001
From: Craig Reese <109101548+craigrva@users.noreply.github.com>
Date: Tue, 8 Oct 2024 15:04:30 -0500
Subject: [PATCH] Revert "Release R2.6.0"

---
 .github/ISSUE_TEMPLATE/tech-spec.md           |  14 +-
 .github/workflows/main.yml                    |  10 +-
 .github/workflows/make-docs.yml               |   4 +-
 Dangerfile                                    |   2 +-
 Gemfile                                       |   4 +-
 Gemfile.lock                                  |   8 +-
 Jenkinsfile                                   |   8 +-
 MAC_M1.md                                     |   6 +-
 Makefile.example                              |   6 +-
 PULL_REQUEST_TEMPLATE.md                      |   4 +-
 README.md                                     |   8 +-
 WINDOWS_11.md                                 |   2 +-
 app/controllers/route_docs_controller.rb      |   2 +-
 app/jobs/missing_vacols_hearing_job_fix.rb    | 133 ---
 ...process_notification_status_updates_job.rb |   2 +-
 ...e_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...w_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...s_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...t_belongs_to_polymorphic_appeal_concern.rb |  24 +-
 ...t_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...e_belongs_to_polymorphic_appeal_concern.rb |  21 +-
 .../decision_review_polymorphic_helper.rb     |  30 -
 .../decision_review_polymorphic_sti_helper.rb |  29 -
 ...t_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...w_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ..._belongs_to_polymorphic_hearing_concern.rb |  14 +-
 ...t_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 ...k_belongs_to_polymorphic_appeal_concern.rb |  26 +-
 ...t_belongs_to_polymorphic_appeal_concern.rb |  14 +-
 app/models/decision_issue.rb                  |  33 +-
 app/models/organizations/business_line.rb     | 456 +++------
 app/models/remand.rb                          |   4 -
 app/models/supplemental_claim.rb              |   2 -
 app/models/tasks/timed_hold_task.rb           |   2 +-
 app/services/business_line_reporter.rb        |   2 +-
 .../change_history_event_serializer.rb        |  23 -
 .../change_history_filter_parser.rb           |  16 +-
 .../change_history_reporter.rb                |   7 +-
 .../claim_history_event.rb                    | 490 +---------
 .../claim_history_service.rb                  |  50 +-
 .../generate_hearing_days_schedule.rb         |   2 +-
 app/views/supplemental_claims/edit.html.erb   |   1 -
 client/COPY.json                              |   4 +-
 client/app/components/Alert.jsx               |  13 +-
 client/app/components/AppFrame.jsx            |  28 -
 client/app/components/SearchBar.stories.mdx   |   4 +-
 .../components/StyleGuideComponentTitle.jsx   |   2 +-
 client/app/components/TableFilter.jsx         |   6 +-
 .../StyleGuide/StyleGuideDashboard.jsx        |   2 +-
 .../app/intake/pages/addIssues/addIssues.jsx  |   5 -
 .../app/intakeEdit/components/EditButtons.jsx |   5 +-
 client/app/intakeEdit/reducers/index.js       |   2 -
 client/app/nonComp/components/Disposition.jsx |  19 +-
 .../IndividualClaimHistoryTable.jsx           | 249 +----
 .../Conditions/DecisionReviewType.jsx         |  69 +-
 client/app/nonComp/pages/ReportPage.jsx       | 163 +---
 client/app/nonComp/util/index.js              |   5 -
 .../caseEvaluation/EvaluateDecisionView.jsx   |   4 +-
 client/app/styles/_main.scss                  |   6 -
 client/app/styles/react/_alerts.scss          |  92 --
 client/app/util/ApiUtil.js                    |   4 +-
 .../REPORT_PAGE_VALIDATION_ERRORS.json        |   1 -
 client/constants/REPORT_TYPE_CONSTANTS.json   | 128 +--
 client/package.json                           |   4 +-
 .../CaseWorkerIndex.test.js.snap              |   9 +-
 .../test/app/nonComp/pages/ReportPage.test.js |  51 +-
 .../ClaimHistoryPage.test.js.snap             | 266 +++---
 client/yarn.lock                              |   4 +-
 config/boot.rb                                |   8 +-
 config/routes.rb                              |   1 -
 ...plemental_claims_for_remand_inheritance.rb |  11 -
 .../20240805154526_create_remands_view.rb     |  20 -
 db/schema.rb                                  |   2 -
 db/seeds/hearings.rb                          |  10 +-
 db/seeds/veterans_health_administration.rb    |  13 -
 .../tech-specs/2018-05-18-hearing-schedule.md |  48 +-
 .../2018-06-21-vacols-caseflow-transition.md  |  66 +-
 .../2018-08-16-slotting-veterans.md           |  20 +-
 .../2018-11-14-schedule-hearing-task.md       |  10 +-
 ...2018-11-16-co-parent-records-transition.md |  10 +-
 .../2018-11-28-legacy-issue-establishment.md  |   8 +-
 .../2018-11-30-alternate-hearing-locations.md |  10 +-
 ...8-12-06-legacy-issue-optin-and-rollback.md |   4 +-
 .../2019-01-28-hearing-task-flow.md           |  22 +-
 .../2019-04-11-hearing-prep-merge.md          |  12 +-
 .../2019-08-01-establish-930-corrections.md   |   2 +-
 ...9-10-10-integrating-caseflow-with-pexip.md |   8 +-
 docs/tech-specs/README.md                     |   4 +-
 .../scripts/missing_vacols_hearing_job_fix.sh |   5 -
 package.json                                  |   5 +
 scripts/dev_env_setup_step1.sh                |   2 +-
 scripts/dev_env_setup_step2.sh                |   4 +-
 scripts/whats-next                            |   2 +-
 .../decision_reviews_controller_spec.rb       | 194 +---
 spec/factories/appeal.rb                      |   2 +-
 spec/factories/higher_level_review.rb         |   2 +-
 spec/factories/issue_modification_request.rb  |  41 +-
 spec/factories/supplemental_claim.rb          |  11 -
 spec/factories/task.rb                        |  18 -
 .../intake/supplemental_claim/edit_spec.rb    |  20 -
 spec/feature/non_comp/dispositions_spec.rb    |  22 -
 .../non_comp/individual_claim_history_spec.rb | 880 +-----------------
 spec/feature/non_comp/report_page_spec.rb     |  71 +-
 spec/feature/non_comp/reviews_spec.rb         |  84 +-
 .../missing_vacols_hearing_job_fix_spec.rb    |  87 --
 spec/lib/helpers/association_wrapper_spec.rb  |   9 +-
 spec/models/appeal_spec.rb                    |   6 +-
 spec/models/business_line_spec.rb             | 251 +----
 spec/models/decision_issue_spec.rb            |  24 -
 spec/models/higher_level_review_spec.rb       |   2 -
 spec/models/supplemental_claim_spec.rb        |  27 -
 spec/rails_helper.rb                          |   2 +-
 spec/services/business_line_reporter_spec.rb  |  23 +-
 .../change_history_event_serializer_spec.rb   |  79 +-
 .../change_history_reporter_spec.rb           | 448 +--------
 .../claim_history_event_spec.rb               | 378 +-------
 .../claim_history_service_spec.rb             | 476 +---------
 spec/support/download_helper.rb               |   4 +-
 yarn.lock                                     |  15 +
 119 files changed, 1010 insertions(+), 5175 deletions(-)
 delete mode 100644 app/jobs/missing_vacols_hearing_job_fix.rb
 delete mode 100644 app/models/concerns/decision_review_polymorphic_helper.rb
 delete mode 100644 app/models/concerns/decision_review_polymorphic_sti_helper.rb
 delete mode 100644 app/models/remand.rb
 delete mode 100644 db/migrate/20240716143816_add_type_column_and_index_to_supplemental_claims_for_remand_inheritance.rb
 delete mode 100644 db/migrate/20240805154526_create_remands_view.rb
 delete mode 100644 lib/helpers/scripts/missing_vacols_hearing_job_fix.sh
 create mode 100644 package.json
 delete mode 100644 spec/jobs/missing_vacols_hearing_job_fix_spec.rb
 create mode 100644 yarn.lock

diff --git a/.github/ISSUE_TEMPLATE/tech-spec.md b/.github/ISSUE_TEMPLATE/tech-spec.md
index 64bcc762737..578fc5bf57f 100644
--- a/.github/ISSUE_TEMPLATE/tech-spec.md
+++ b/.github/ISSUE_TEMPLATE/tech-spec.md
@@ -8,16 +8,16 @@ assignees: ''
 ---
 
 # Tech Spec Title
-**Drafter**: <!-- Your name -->
-**Discussion Meeting**: <!-- Date to discussion the spec as a team; send calendar invite! -->
+**Drafter**: <!-- Your name -->  
+**Discussion Meeting**: <!-- Date to discussion the spec as a team; send calendar invite! -->  
 
 <!-- Tech specs are a lightweight format for documenting technical research and decision making. The headings below are guidelines, not rules, so modify your copy as you see fit. Especially large tech specs may require more headings and subheadings for example. Be rigorous in your research and planning, but balance that with forward progress - if something is uncertain, document that appropriately and move on if you can. Getting feedback early from team mates during tech spec writing can be helpful too.
 Tech specs are considered 'done' when key stakeholders have reviewed and approved the approach. -->
 
 ## Context
-<!-- Why are you creating this tech spec?
+<!-- Why are you creating this tech spec? 
 
-What information helps readers understand the rest of this tech spec?
+What information helps readers understand the rest of this tech spec? 
 
 Who are the stakeholders? -->
 
@@ -31,11 +31,11 @@ Who are the stakeholders? -->
 <!-- Concerns about potential solutions. Explicitly state if they should be addressed in the chosen solution. -->
 
 ## Open Questions
-<!-- Sometimes we're missing information needed to fully spec work.
+<!-- Sometimes we're missing information needed to fully spec work. 
 What is missing? Who can answer these questions, and how might it affect the recommendation? -->
 
 ## Implementation Options
-<!--
+<!-- 
 Consider multiple implementation paths.
 What are their recommended action items?
 These may change as feedback is given, but after the tech spec is approved these should be written as fully defined/pointed github issues.
@@ -66,4 +66,4 @@ How will we safely ship this work? Are there migrations, external dependencies t
  - [ ] Tech spec drafter: Turn tech spec into next-step actionable tickets.
     - [ ] Write tickets as is necessary
     - [ ] Other developers provide more formal feedback as is necessary.
-- [ ] Once the tech spec is finalized, open a PR to add it to the docs/tech-specs directory following [these instructions](https://github.com/department-of-veterans-affairs/caseflow/tree/main/docs/tech-specs/README.md)
+- [ ] Once the tech spec is finalized, open a PR to add it to the docs/tech-specs directory following [these instructions](https://github.com/department-of-veterans-affairs/caseflow/tree/master/docs/tech-specs/README.md)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc859fd652c..0f7f7efc7c7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
-name: PRs to main
-on:
+name: PRs to master
+on: 
   pull_request:
-    branches: [main]
+    branches: [master]
     types: [closed]
 jobs:
   merge-master-back-to-dev:
@@ -14,10 +14,10 @@ jobs:
       run: |
           git config --local user.email "jeremy.shields@va.gov"
           git config --local user.name "Jeremy Shields"
-    - name: Merge main back to dev
+    - name: Merge master back to dev
       run: |
           git fetch --unshallow
           git checkout development
           git pull
-          git merge -Xtheirs --no-ff main -m "Auto-merge main back to dev"
+          git merge -Xtheirs --no-ff master -m "Auto-merge master back to dev"
           git push
diff --git a/.github/workflows/make-docs.yml b/.github/workflows/make-docs.yml
index 0d2bec4a321..7d4516d5621 100644
--- a/.github/workflows/make-docs.yml
+++ b/.github/workflows/make-docs.yml
@@ -1,10 +1,10 @@
 name: Make-docs-to-webpage
 
-# Trigger whenever changes are made to the main branch
+# Trigger whenever changes are made to the master branch
 on:
   push:
     branches:
-      - main
+      - master
 
 jobs:
   make_docs:
diff --git a/Dangerfile b/Dangerfile
index 85bcda75ec6..1fb8280ddae 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -25,7 +25,7 @@ if git.modified_files.grep(/app\/services\//).any?
   )
 end
 
-# Don't let testing shortcuts get into main by accident
+# Don't let testing shortcuts get into master by accident
 if `git diff #{github.base_commit} spec/ | grep -E '(:focus => true)|(focus: true)'`.length > 1
   fail("focus: true is left in test")
 end
diff --git a/Gemfile b/Gemfile
index dfcd2f36636..a6e0728b60e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,7 +65,7 @@ gem "pdfjs_viewer-rails", git: "https://github.com/senny/pdfjs_viewer-rails.git"
 # Used to build out PDF files on the backend
 # https://github.com/pdfkit/pdfkit
 gem "pdfkit"
-gem "pg", "~> 1.5.7", platforms: :ruby
+gem "pg", platforms: :ruby
 # Application server: Puma
 # Puma was chosen because it handles load of 40+ concurrent users better than Unicorn and Passenger
 # Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
@@ -104,7 +104,7 @@ gem "ziptz"
 group :production, :staging, :ssh_forwarding, :development, :test do
   # Oracle DB
   gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
-  gem "ruby-oci8", "~> 2.2.14"
+  gem "ruby-oci8", "~> 2.2"
 end
 
 group :test, :development, :demo, :make_docs do
diff --git a/Gemfile.lock b/Gemfile.lock
index 62c505e6a11..2632deaf2e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1839,7 +1839,7 @@ GEM
       cliver (~> 0.3.2)
       safe_shell (>= 1.0.3, < 2.0)
     pdfkit (0.8.7.2)
-    pg (1.5.7)
+    pg (1.1.4)
     pluck_to_hash (1.0.2)
       activerecord (>= 4.0.2)
       activesupport (>= 4.0.2)
@@ -1990,7 +1990,7 @@ GEM
     ruby-debug-ide (0.7.3)
       rake (>= 0.8.1)
     ruby-graphviz (1.2.4)
-    ruby-oci8 (2.2.14)
+    ruby-oci8 (2.2.7)
     ruby-plsql (0.8.0)
     ruby-prof (1.4.1)
     ruby-progressbar (1.13.0)
@@ -2201,7 +2201,7 @@ DEPENDENCIES
   pdf-forms
   pdfjs_viewer-rails!
   pdfkit
-  pg (~> 1.5.7)
+  pg
   pluck_to_hash
   pry (~> 0.13.0)
   pry-byebug (~> 3.9)
@@ -2229,7 +2229,7 @@ DEPENDENCIES
   rubocop-performance
   rubocop-rails
   ruby-debug-ide
-  ruby-oci8 (~> 2.2.14)
+  ruby-oci8 (~> 2.2)
   ruby-prof (~> 1.4)
   ruby_claim_evidence_api!
   sass-rails (~> 5.0)
diff --git a/Jenkinsfile b/Jenkinsfile
index 6698b6a5486..61d68a36392 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,9 +13,9 @@ def APP_VERSION = env.APP_VERSION ?: 'HEAD';
 
 def DEPLOY_MESSAGE = null
 
-// Allows appeals-deployment branch (defaults to main) to be overridden for
+// Allows appeals-deployment branch (defaults to master) to be overridden for
 // testing purposes
-def DEPLOY_BRANCH = (env.DEPLOY_BRANCH != null) ? env.DEPLOY_BRANCH : 'main'
+def DEPLOY_BRANCH = (env.DEPLOY_BRANCH != null) ? env.DEPLOY_BRANCH : 'master'
 
 /************************ Common Pipeline boilerplate ************************/
 
@@ -43,7 +43,7 @@ node('deploy') {
         checkout scm
         DEPLOY_MESSAGE = sh (
           // this script will:
-          // get the latest `deployed` release created by: https://github.com/department-of-veterans-affairs/appeals-deployment/blob/main/ansible/utility-roles/deployed-version/files/tag_deployed_commit.py
+          // get the latest `deployed` release created by: https://github.com/department-of-veterans-affairs/appeals-deployment/blob/master/ansible/utility-roles/deployed-version/files/tag_deployed_commit.py
           // compare current HEAD commit to the last deployed release
           // save the message to be announced in Slack by the pipeline
           script: "git log \$(git ls-remote --tags https://${env.GIT_CREDENTIAL}@github.com/department-of-veterans-affairs/caseflow.git \
@@ -79,4 +79,4 @@ if (env.COMMON_PIPELINE_TASK == 'bake') {
   commonPipeline.build(APP_NAME, APP_VERSION, DEPLOY_MESSAGE);
 } else if (env.COMMON_PIPELINE_TASK == 'deploy'){
   commonPipeline.deploy(APP_NAME, APP_VERSION, DEPLOY_MESSAGE);
-}
+}
\ No newline at end of file
diff --git a/MAC_M1.md b/MAC_M1.md
index 706adf4d206..2fbe9244ae4 100644
--- a/MAC_M1.md
+++ b/MAC_M1.md
@@ -187,10 +187,10 @@ Running Caseflow
 	  2. that you are using arm64 brew by doing `which brew` and ensuring the output is `/opt/homebrew/bin/brew`
 3. Open caseflow in VSCode (optional), or navigate to the caseflow directory in your terminal and:
 	  1. `brew install yarn`
-4. Ensure you are on main branch and up to date by running
-    1. ```git checkout main```
+4. Ensure you are on master branch and up to date by running
+    1. ```git checkout master```
     2. ```git fetch```
-    3. ```git pull origin main```
+    3. ```git pull origin master```
 5. Start Vacols UTM VM (if not already running)
 6. run `make up-m1` to create the docker containers and volumes
 7. run `make reset` to (re)create and seed the database; this takes a while (~45 minutes)
diff --git a/Makefile.example b/Makefile.example
index 014cc4a0a96..45080635702 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -35,7 +35,7 @@
 #   # pulled latest from github? try:
 #   % make install migrate
 #
-#   # get fully up to date with main on origin and all deps & db?
+#   # get fully up to date with master on origin and all deps & db?
 #   % make update
 #
 # Hopefully the targets are easy enough to remember to make this useful to others.
@@ -240,7 +240,7 @@ migrate: external-db-remove etl-migrate etl-test-prepare db-migrate ## Migrate a
 
 rollback: etl-rollback db-rollback	## Rollback all Rails databases
 
-fresh:  ## https://github.com/imsky/git-fresh - updates local main to match origin, stashes changes, prunes remote branches
+fresh:  ## https://github.com/imsky/git-fresh - updates local master to match origin, stashes changes, prunes remote branches
 	git fresh
 
 reset: reset-dbs seed-dbs enable-feature-flags ## Resets databases and enable feature flags
@@ -275,7 +275,7 @@ client-install:  ## Installs javascript dependencies
 
 install: bundle-install client-install  ## Installs all dependencies
 
-update: fresh install migrate  ## Get fully up to date with origin main - pulls origin, installs all deps and runs any db migrations
+update: fresh install migrate  ## Get fully up to date with origin master - pulls origin, installs all deps and runs any db migrations
 
 client-build-test client-test:  ## Builds webpack for tests
 	cd client && yarn run build:test
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 3c24c70510a..618e6e5529d 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -11,7 +11,7 @@ Please explain the changes you made here.
 <!-- Change JIRA-12345 to reflect the URL of the location of the test plan(s) for this PR -->
 1. Go to [Jira Issue/Test Plan Link](https://jira.devops.va.gov/browse/JIRA-12345) or list them below
 
-- [ ] For feature branches merging into main: Was this deployed to UAT?
+- [ ] For feature branches merging into master: Was this deployed to UAT?
 
 # Frontend
 ## User Facing Changes
@@ -31,7 +31,7 @@ Please explain the changes you made here.
 *Only for Schema Changes*
 
 * [ ] Add typical timestamps (`created_at`, `updated_at`) for new tables
-* [ ] Update column comments; include a "PII" prefix to indicate definite or potential [PII data content](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/caseflow-team/0-how-we-work/pii-handbook.md#what-is-pii)
+* [ ] Update column comments; include a "PII" prefix to indicate definite or potential [PII data content](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/caseflow-team/0-how-we-work/pii-handbook.md#what-is-pii)
 * [ ] Have your migration classes inherit from `Caseflow::Migration`, especially when adding indexes (use `add_safe_index`) (see [Writing DB migrations](https://github.com/department-of-veterans-affairs/caseflow/wiki/Writing-DB-migrations))
 * [ ] Verify that `migrate:rollback` works as desired ([`change` supported functions](https://edgeguides.rubyonrails.org/active_record_migrations.html#using-the-change-method))
 * [ ] Perform query profiling (eyeball Rails log, check bullet and fasterer output)
diff --git a/README.md b/README.md
index 334b3ea2751..281703aa1e2 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ First you'll need to install ansible-vault and credstash.
 pip install ansible-vault
 pip install credstash
 ```
-For more credstash setup, follow [the doc](https://github.com/department-of-veterans-affairs/appeals-deployment/blob/main/docs/credstash.md#using-credstash)
+For more credstash setup, follow [the doc](https://github.com/department-of-veterans-affairs/appeals-deployment/blob/master/docs/credstash.md#using-credstash)
 
 We'll need to obtain the Ansible vault password using credstash:
 
@@ -267,8 +267,8 @@ Rails.cache.write(:degraded_service_banner, :auto)
 
 We have a lot of technical documentation spread over a lot of different repositories. Here is a non-exhaustive mapping of where to find documentation:
 
-- [Local Caseflow Setup](https://github.com/department-of-veterans-affairs/caseflow/tree/main/docs)
+- [Local Caseflow Setup](https://github.com/department-of-veterans-affairs/caseflow/tree/master/docs)
 - [Test data setup in lower environments](https://github.com/department-of-veterans-affairs/appeals-qa/tree/master/docs)
-- [Caseflow specific devops documentation](https://github.com/department-of-veterans-affairs/appeals-deployment/tree/main/docs) This folder also contains our [first responder manual](https://github.com/department-of-veterans-affairs/appeals-deployment/blob/main/docs/first-responder-manual.md), which is super in understanding our production systems.
+- [Caseflow specific devops documentation](https://github.com/department-of-veterans-affairs/appeals-deployment/tree/master/docs) This folder also contains our [first responder manual](https://github.com/department-of-veterans-affairs/appeals-deployment/blob/master/docs/first-responder-manual.md), which is super in understanding our production systems.
 - [Non-Caseflow specific devops documentation](https://github.com/department-of-veterans-affairs/devops/tree/master/docs). This documentation is shared with the vets.gov team, so not all of it is relevant.
-- [Project documentation](https://github.com/department-of-veterans-affairs/appeals-design-research/tree/main/Project%20Folders)
+- [Project documentation](https://github.com/department-of-veterans-affairs/appeals-design-research/tree/master/Project%20Folders)
diff --git a/WINDOWS_11.md b/WINDOWS_11.md
index f7ec6fe1e08..8d7f388a3d9 100644
--- a/WINDOWS_11.md
+++ b/WINDOWS_11.md
@@ -130,7 +130,7 @@ Run each line is a separate command, run them one at a time
 
 24. Close and restart VS Code
 
-25. branch should be up to date with main (```git checkout main```, ```git pull```)
+25. branch should be up to date with master (```git checkout master```, ```git pull```)
 
 26. ```cd ~/appeals/caseflow in terminal```
 
diff --git a/app/controllers/route_docs_controller.rb b/app/controllers/route_docs_controller.rb
index b51474ea25b..99df04daf33 100644
--- a/app/controllers/route_docs_controller.rb
+++ b/app/controllers/route_docs_controller.rb
@@ -2,7 +2,7 @@
 
 class RouteDocsController < ApplicationController
   class DocumentedRoute
-    SOURCE_URL_PREFIX = "https://github.com/department-of-veterans-affairs/caseflow/blob/main/app/controllers/"
+    SOURCE_URL_PREFIX = "https://github.com/department-of-veterans-affairs/caseflow/blob/master/app/controllers/"
 
     attr_reader :rails_route
 
diff --git a/app/jobs/missing_vacols_hearing_job_fix.rb b/app/jobs/missing_vacols_hearing_job_fix.rb
deleted file mode 100644
index 58e01388427..00000000000
--- a/app/jobs/missing_vacols_hearing_job_fix.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# frozen_string_literal: true
-
-# ************************
-# Remediates AssignHearingDispositionTasks that are stuck in the
-# 'assigned' status due to a VACOLS record not existing for the
-# associated LegacyHearing. This job will create a VACOLS record for the
-# associated LegacyHearing, cancel the task, then destroy the VACOLS record.
-# The VACOLS record is deleted because the exact time of the hearing cannot be
-# recorded accurately and we do not want any false data to exist.
-# ************************
-class MissingVacolsHearingJobFix
-  def initialize
-    @stuck_job_report_service = StuckJobReportService.new
-    @start_time = nil
-    @end_time = nil
-    @tasks_missing_hearings = []
-  end
-
-  def perform
-    start_time
-    RequestStore[:current_user] = User.system_user
-    return "There are no stuck AssignHearingDisposition tasks." if questionable_tasks.blank?
-
-    process_missing_vacols_records
-
-    unless @tasks_missing_hearings.blank?
-      Rails.logger.error("ALERT------- Task Id's: #{@tasks_missing_hearings.to_sentence} are missing" \
-      " associated hearings. This requires manual remediation------- ALERT")
-    end
-    end_time
-    log_processing_time
-  end
-
-  def process_missing_vacols_records
-    questionable_tasks
-    # These tasks are stuck because they have a LegacyHearing associated with them that do not exist in VACOLS
-
-    stuck_tasks(questionable_tasks).each do |task|
-      task = Task.find(task.id)
-      appeal = task.appeal
-      hearing = task.hearing
-
-      attributes = get_attributes(appeal, hearing)
-      process_vacols_record(attributes, task)
-    end
-  rescue StandardError => error
-    Rails.logger.error("Something went wrong. Requires manual remediation. Error: #{error} Aborting...")
-
-    raise error
-  end
-
-  def questionable_tasks
-    Task.where(
-      type: "AssignHearingDispositionTask",
-      status: "assigned",
-      appeal_type: "LegacyAppeal",
-      assigned_at: 7.years.ago..6.months.ago
-    )
-  end
-
-  # :reek:FeatureEnvy
-  def stuck_tasks(questionable_tasks)
-    tasks_with_hearing_missing_vacols_records = []
-    questionable_tasks.each do |task|
-      if task.hearing.nil?
-        @tasks_missing_hearings.push(task.id)
-        next
-      end
-
-      if VACOLS::CaseHearing.find_by(hearing_pkseq: task.hearing.vacols_id).nil?
-        # adds the stuck task associated with the missing VACOLS hearing
-        tasks_with_hearing_missing_vacols_records.push(task)
-      end
-    end
-
-    tasks_with_hearing_missing_vacols_records
-  end
-
-  def process_vacols_record(attrs, task)
-    vacols_record = create_hearing_in_vacols(attrs)
-    if vacols_record
-      task.hearing.update(vacols_id: vacols_record[:hearing_pkseq])
-      task.cancelled!
-      vacols_record.destroy!
-    end
-  rescue StandardError => error
-    Rails.logger.error("Something went wrong. Requires manual remediation. Error: #{error} Aborting...")
-    raise Interrupt
-  end
-
-  def create_hearing_in_vacols(attrs)
-    vacols_record = VACOLS::CaseHearing.create_hearing!(
-      folder_nr: attrs[:appeal].vacols_id,
-      hearing_pkseq: attrs[:vacols_id],
-      hearing_date: VacolsHelper.format_datetime_with_utc_timezone(attrs[:scheduled_for]),
-      vdkey: attrs[:hearing_day].id,
-      hearing_type: attrs[:hearing_day].request_type,
-      room: attrs[:hearing_day].room,
-      board_member: attrs[:hearing_day].judge ? attrs[:hearing_day].judge.vacols_attorney_id : nil,
-      vdbvapoc: attrs[:hearing_day].bva_poc,
-      notes1: attrs[:notes]
-    )
-
-    vacols_record
-  end
-
-  def get_attributes(appeal, hearing)
-    scheduled_for = HearingDatetimeService.prepare_datetime_for_storage(
-      date: hearing.hearing_day.scheduled_for,
-      time_string: "1:00 PM Central Time (US & Canada)"
-    )
-
-    attrs = {
-      hearing_day: hearing.hearing_day,
-      appeal: appeal,
-      scheduled_for: scheduled_for,
-      notes: ""
-    }
-    attrs
-  end
-
-  def log_processing_time
-    (@end_time && @start_time) ? @end_time - @start_time : 0
-  end
-
-  def start_time
-    @start_time ||= Time.zone.now
-  end
-
-  def end_time
-    @end_time ||= Time.zone.now
-  end
-end
diff --git a/app/jobs/process_notification_status_updates_job.rb b/app/jobs/process_notification_status_updates_job.rb
index 990596f9339..7c8571c8c6a 100644
--- a/app/jobs/process_notification_status_updates_job.rb
+++ b/app/jobs/process_notification_status_updates_job.rb
@@ -62,7 +62,7 @@ def recv_queue_url
   #  and consume the data in order to persist VA Notify status updates to the
   #  the notifications table.
   #
-  # @see https://github.com/department-of-veterans-affairs/caseflow/blob/main/app/controllers/api/v1/va_notify_controller.rb
+  # @see https://github.com/department-of-veterans-affairs/caseflow/blob/master/app/controllers/api/v1/va_notify_controller.rb
   #
   # @return [Integer]
   #   The number of messages that were attempted to be processed in a batch.
diff --git a/app/models/concerns/appeal_state_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/appeal_state_belongs_to_polymorphic_appeal_concern.rb
index 7d3a575c7b7..963b6e26371 100644
--- a/app/models/concerns/appeal_state_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/appeal_state_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module AppealStateBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :appeal_states, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(appeal_states: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(appeal_states: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/attorney_case_review_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/attorney_case_review_belongs_to_polymorphic_appeal_concern.rb
index 70039fbc321..6ee39b146d2 100644
--- a/app/models/concerns/attorney_case_review_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/attorney_case_review_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module AttorneyCaseReviewBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :attorney_case_reviews, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(attorney_case_reviews: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(attorney_case_reviews: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/available_hearing_locations_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/available_hearing_locations_belongs_to_polymorphic_appeal_concern.rb
index 926a75fba65..901c94706de 100644
--- a/app/models/concerns/available_hearing_locations_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/available_hearing_locations_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module AvailableHearingLocationsBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :available_hearing_locations, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(available_hearing_locations: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(available_hearing_locations: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/claimant_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/claimant_belongs_to_polymorphic_appeal_concern.rb
index b32a1b9b521..dd7de661815 100644
--- a/app/models/concerns/claimant_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/claimant_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,29 @@
 
 module ClaimantBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:decision_review, :claimants)
+    belongs_to :decision_review, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(claimants: { decision_review_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "decision_review_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(claimants: { decision_review_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "decision_review_id", optional: true
+
+    belongs_to :higher_level_review,
+               -> { where(claimants: { decision_review_type: "HigherLevelReview" }) },
+               class_name: "HigherLevelReview", foreign_key: "decision_review_id", optional: true
+
+    belongs_to :supplemental_claim,
+               -> { where(claimants: { decision_review_type: "SupplementalClaim" }) },
+               class_name: "SupplementalClaim", foreign_key: "decision_review_id", optional: true
+
+    scope :ama, -> { where(decision_review_type: "Appeal") }
+    scope :legacy, -> { where(decision_review_type: "LegacyAppeal") }
+    scope :higher_level_review, -> { where(decision_review_type: "HigherLevelReview") }
+    scope :supplemental_claim, -> { where(decision_review_type: "SupplementalClaim") }
   end
 end
diff --git a/app/models/concerns/decision_document_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/decision_document_belongs_to_polymorphic_appeal_concern.rb
index 92f07fa0516..264029a5212 100644
--- a/app/models/concerns/decision_document_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/decision_document_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module DecisionDocumentBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :decision_documents, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(decision_documents: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(decision_documents: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/decision_issue_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/decision_issue_belongs_to_polymorphic_appeal_concern.rb
index f4355794a27..ae4cd6ba075 100644
--- a/app/models/concerns/decision_issue_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/decision_issue_belongs_to_polymorphic_appeal_concern.rb
@@ -2,11 +2,24 @@
 
 module DecisionIssueBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:decision_review,
-                                                    :decision_issues,
-                                                    %w[Appeal HigherLevelReview SupplementalClaim])
+    belongs_to :decision_review, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(decision_issues: { decision_review_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "decision_review_id", optional: true
+
+    belongs_to :higher_level_review,
+               -> { where(decision_issues: { decision_review_type: "HigherLevelReview" }) },
+               class_name: "HigherLevelReview", foreign_key: "decision_review_id", optional: true
+
+    belongs_to :supplemental_claim,
+               -> { where(decision_issues: { decision_review_type: "SupplementalClaim" }) },
+               class_name: "SupplementalClaim", foreign_key: "decision_review_id", optional: true
+
+    scope :ama, -> { where(decision_review_type: "Appeal") }
+    scope :higher_level_review, -> { where(decision_review_type: "HigherLevelReview") }
+    scope :supplemental_claim, -> { where(decision_review_type: "SupplementalClaim") }
   end
 end
diff --git a/app/models/concerns/decision_review_polymorphic_helper.rb b/app/models/concerns/decision_review_polymorphic_helper.rb
deleted file mode 100644
index 4082a2314de..00000000000
--- a/app/models/concerns/decision_review_polymorphic_helper.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module DecisionReviewPolymorphicHelper
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def define_polymorphic_decision_review_associations(association_name, from_association_name, types = nil)
-      belongs_to association_name, polymorphic: true
-
-      # Specific association mappings that are uniquely different from the calculated class name to underscored symbol
-      association_name_mapping = { "Appeal" => :ama_appeal, "Hearing" => :ama_hearing }
-      scope_mapping = { "Appeal" => :ama, "LegacyAppeal" => :legacy, "LegacyHearing" => :legacy, "Hearing" => :ama }
-
-      # LegacyAppeals + all of the non abstract subtypes of DecisionReview not incuding child types for STI
-      types ||= %w[Appeal LegacyAppeal HigherLevelReview SupplementalClaim]
-
-      types.each do |type|
-        type_symbol = type.underscore.to_sym
-        belongs_to_association_name = association_name_mapping[type] || type_symbol
-        scope_name = scope_mapping[type] || type_symbol
-
-        belongs_to belongs_to_association_name,
-                   -> { where(from_association_name => { "#{association_name}_type": type }) },
-                   class_name: type, foreign_key: "#{association_name}_id", optional: true
-
-        scope scope_name.to_sym, -> { where("#{association_name}_type": type) }
-      end
-    end
-  end
-end
diff --git a/app/models/concerns/decision_review_polymorphic_sti_helper.rb b/app/models/concerns/decision_review_polymorphic_sti_helper.rb
deleted file mode 100644
index b7a1af23778..00000000000
--- a/app/models/concerns/decision_review_polymorphic_sti_helper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module DecisionReviewPolymorphicSTIHelper
-  extend ActiveSupport::Concern
-
-  class_methods do
-    def define_polymorphic_decision_review_sti_associations(association_name, from_association_name, types = nil)
-      # Mappings between STI types and their associated parent type and parent database table
-      sti_table_mapping = { "Remand" => :supplemental_claims }
-      sti_type_mapping = { "Remand" => "SupplementalClaim" }
-
-      types ||= %w[Remand]
-
-      types.each do |type|
-        type_symbol = type.underscore.to_sym
-        belongs_to_association_name = type_symbol
-        sti_type = sti_type_mapping[type] || type
-        sti_table_name = sti_table_mapping[type] || association_name
-
-        belongs_to belongs_to_association_name,
-                   lambda {
-                     where(from_association_name => { "#{association_name}_type": sti_type })
-                       .where(Arel::Table.new(sti_table_name)[:type].eq(type))
-                   },
-                   class_name: type, foreign_key: "#{association_name}_id", optional: true
-      end
-    end
-  end
-end
diff --git a/app/models/concerns/hearing_email_recipient_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/hearing_email_recipient_belongs_to_polymorphic_appeal_concern.rb
index 213b3edb166..772a47edb85 100644
--- a/app/models/concerns/hearing_email_recipient_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/hearing_email_recipient_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module HearingEmailRecipientBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :hearing_email_recipients, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(hearing_email_recipients: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(hearing_email_recipients: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/judge_case_review_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/judge_case_review_belongs_to_polymorphic_appeal_concern.rb
index 8fae1ccf999..9400c88b5f1 100644
--- a/app/models/concerns/judge_case_review_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/judge_case_review_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module JudgeCaseReviewBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :judge_case_reviews, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(judge_case_reviews: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(judge_case_reviews: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/sent_hearing_email_event_belongs_to_polymorphic_hearing_concern.rb b/app/models/concerns/sent_hearing_email_event_belongs_to_polymorphic_hearing_concern.rb
index 3c3f3453cf7..d0cc44c4cb9 100644
--- a/app/models/concerns/sent_hearing_email_event_belongs_to_polymorphic_hearing_concern.rb
+++ b/app/models/concerns/sent_hearing_email_event_belongs_to_polymorphic_hearing_concern.rb
@@ -2,9 +2,19 @@
 
 module SentHearingEmailEventBelongsToPolymorphicHearingConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:hearing, :sent_hearing_email_events, %w[Hearing LegacyHearing])
+    belongs_to :hearing, polymorphic: true
+
+    belongs_to :ama_hearing,
+               -> { where(sent_hearing_email_events: { hearing_type: "Hearing" }) },
+               class_name: "Hearing", foreign_key: "hearing_id", optional: true
+
+    belongs_to :legacy_hearing,
+               -> { where(sent_hearing_email_events: { hearing_type: "LegacyHearing" }) },
+               class_name: "LegacyHearing", foreign_key: "hearing_id", optional: true
+
+    scope :ama, -> { where(hearing_type: "Hearing") }
+    scope :legacy, -> { where(hearing_type: "LegacyHearing") }
   end
 end
diff --git a/app/models/concerns/special_issue_list_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/special_issue_list_belongs_to_polymorphic_appeal_concern.rb
index 44bf31e835a..ed19b084975 100644
--- a/app/models/concerns/special_issue_list_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/special_issue_list_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module SpecialIssueListBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :special_issue_lists, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(special_issue_lists: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(special_issue_lists: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
index d1666b1ff93..56a321d80e4 100644
--- a/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/task_belongs_to_polymorphic_appeal_concern.rb
@@ -2,11 +2,29 @@
 
 module TaskBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
-  include DecisionReviewPolymorphicSTIHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :tasks)
-    define_polymorphic_decision_review_sti_associations(:appeal, :tasks)
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(tasks: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(tasks: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :higher_level_review,
+               -> { where(tasks: { appeal_type: "HigherLevelReview" }) },
+               class_name: "HigherLevelReview", foreign_key: "appeal_id", optional: true
+
+    belongs_to :supplemental_claim,
+               -> { where(tasks: { appeal_type: "SupplementalClaim" }) },
+               class_name: "SupplementalClaim", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
+    scope :higher_level_review, -> { where(appeal_type: "HigherLevelReview") }
+    scope :supplemental_claim, -> { where(appeal_type: "SupplementalClaim") }
   end
 end
diff --git a/app/models/concerns/vbms_uploaded_document_belongs_to_polymorphic_appeal_concern.rb b/app/models/concerns/vbms_uploaded_document_belongs_to_polymorphic_appeal_concern.rb
index e2f89793d40..6e332469f35 100644
--- a/app/models/concerns/vbms_uploaded_document_belongs_to_polymorphic_appeal_concern.rb
+++ b/app/models/concerns/vbms_uploaded_document_belongs_to_polymorphic_appeal_concern.rb
@@ -2,9 +2,19 @@
 
 module VbmsUploadedDocumentBelongsToPolymorphicAppealConcern
   extend ActiveSupport::Concern
-  include DecisionReviewPolymorphicHelper
 
   included do
-    define_polymorphic_decision_review_associations(:appeal, :vbms_uploaded_documents, %w[Appeal LegacyAppeal])
+    belongs_to :appeal, polymorphic: true
+
+    belongs_to :ama_appeal,
+               -> { where(vbms_uploaded_documents: { appeal_type: "Appeal" }) },
+               class_name: "Appeal", foreign_key: "appeal_id", optional: true
+
+    belongs_to :legacy_appeal,
+               -> { where(vbms_uploaded_documents: { appeal_type: "LegacyAppeal" }) },
+               class_name: "LegacyAppeal", foreign_key: "appeal_id", optional: true
+
+    scope :ama, -> { where(appeal_type: "Appeal") }
+    scope :legacy, -> { where(appeal_type: "LegacyAppeal") }
   end
 end
diff --git a/app/models/decision_issue.rb b/app/models/decision_issue.rb
index 7dff27d5f0f..95ef1f19422 100644
--- a/app/models/decision_issue.rb
+++ b/app/models/decision_issue.rb
@@ -250,7 +250,14 @@ def create_remand_supplemental_claim!
     # Checking our assumption that approx_decision_date will always be populated for Decision Issues
     fail "approx_decision_date is required to create a DTA Supplemental Claim" unless approx_decision_date
 
-    sc = determine_remand_creation_type
+    sc = SupplementalClaim.create!(
+      veteran_file_number: veteran_file_number,
+      decision_review_remanded: decision_review,
+      benefit_type: benefit_type,
+      legacy_opt_in_approved: decision_review.legacy_opt_in_approved,
+      veteran_is_not_claimant: decision_review.veteran_is_not_claimant,
+      receipt_date: approx_decision_date
+    )
     fail AppealDTAPayeeCodeError, decision_review.id unless dta_payee_code
 
     sc.create_claimant!(
@@ -266,28 +273,4 @@ def create_remand_supplemental_claim!
     decision_review.update_error!("DTA SC creation failed")
     raise
   end
-
-  # Create a Remand if the decision review is an Appeal.
-  # HLRs will still create remands as SupplementalClaims as of (APPEALS-41559)
-  def determine_remand_creation_type
-    if decision_review_type == Appeal.name
-      Remand.create!(
-        veteran_file_number: veteran_file_number,
-        decision_review_remanded: decision_review,
-        benefit_type: benefit_type,
-        legacy_opt_in_approved: decision_review.legacy_opt_in_approved,
-        veteran_is_not_claimant: decision_review.veteran_is_not_claimant,
-        receipt_date: approx_decision_date
-      )
-    else
-      SupplementalClaim.create!(
-        veteran_file_number: veteran_file_number,
-        decision_review_remanded: decision_review,
-        benefit_type: benefit_type,
-        legacy_opt_in_approved: decision_review.legacy_opt_in_approved,
-        veteran_is_not_claimant: decision_review.veteran_is_not_claimant,
-        receipt_date: approx_decision_date
-      )
-    end
-  end
 end
diff --git a/app/models/organizations/business_line.rb b/app/models/organizations/business_line.rb
index 23628e730c7..5b43066bce2 100644
--- a/app/models/organizations/business_line.rb
+++ b/app/models/organizations/business_line.rb
@@ -106,9 +106,6 @@ class QueryBuilder
       "SupplementalClaim" => Task.arel_table[:appeal_type]
         .eq("SupplementalClaim")
         .and(Task.arel_table[:type].eq(DecisionReviewTask.name))
-        .and(Arel.sql("sub_type").not_eq("Remand")),
-      "Remand" => Arel.sql("sub_type").eq("Remand")
-        .and(Task.arel_table[:type].eq(DecisionReviewTask.name))
     }.freeze
 
     DEFAULT_ORDERING_HASH = {
@@ -126,15 +123,6 @@ class QueryBuilder
       }
     }.freeze
 
-    USER_TABLE_ALIASES = [
-      :intake_users,
-      :update_users,
-      :decision_users,
-      :decision_users_completed_by,
-      :requestor,
-      :decider
-    ].freeze
-
     def initialize(query_type: :in_progress, parent: business_line, query_params: {})
       @query_type = query_type
       @parent = parent
@@ -152,76 +140,42 @@ def build_query
         .order(order_clause)
     end
 
-    def task_type_query_helper(join_association)
-      Task.send(parent.tasks_query_type[query_type])
-        .select("tasks.id AS task_id, tasks.type AS task_type")
-        .joins(join_association)
+    def task_type_count
+      Task.select(Task.arel_table[:type])
+        .from(combined_decision_review_tasks_query)
+        .group(Task.arel_table[:type], Task.arel_table[:appeal_type])
+        .count
+    end
+
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
+    def issue_type_count
+      shared_select_statement = "tasks.id as tasks_id, request_issues.nonrating_issue_category as issue_category"
+      appeals_query = Task.send(parent.tasks_query_type[query_type])
+        .select(shared_select_statement)
+        .joins(ama_appeal: :request_issues)
         .joins(issue_modification_request_join)
         .where(query_constraints)
         .where(issue_modification_request_filter)
-    end
-
-    def task_type_board_grant_helper
-      Task.send(parent.tasks_query_type[query_type])
-        .select("tasks.id AS task_id, tasks.type AS task_type, 'Appeal' AS decision_review_type")
-        .joins(board_grant_effectuation_task_appeals_requests_join)
+      hlr_query = Task.send(parent.tasks_query_type[query_type])
+        .select(shared_select_statement)
+        .joins(supplemental_claim: :request_issues)
         .joins(issue_modification_request_join)
-        .where(board_grant_effectuation_task_constraints)
+        .where(query_constraints)
         .where(issue_modification_request_filter)
-    end
-
-    def issue_type_query_helper(join_association)
-      Task.send(parent.tasks_query_type[query_type])
-        .select("tasks.id as task_id, request_issues.nonrating_issue_category AS issue_category")
-        .joins(join_association)
+      sc_query = Task.send(parent.tasks_query_type[query_type])
+        .select(shared_select_statement)
+        .joins(higher_level_review: :request_issues)
         .joins(issue_modification_request_join)
         .where(query_constraints)
         .where(issue_modification_request_filter)
-    end
-
-    # rubocop:disable Metrics/MethodLength
-    def task_type_count
-      appeals_query = task_type_query_helper(ama_appeal: :request_issues)
-        .select("'Appeal' AS decision_review_type")
-      hlr_query = task_type_query_helper(higher_level_review: :request_issues)
-        .select("'HigherLevelReview' AS decision_review_type")
-      sc_query = task_type_query_helper(supplemental_claim: :request_issues)
-        .select("supplemental_claims.type AS decision_review_type")
-      board_grant_query = task_type_board_grant_helper
-
-      task_count = ActiveRecord::Base.connection.execute <<-SQL
-        WITH task_review_issues AS (
-            #{hlr_query.to_sql}
-          UNION
-            #{sc_query.to_sql}
-          UNION
-            #{appeals_query.to_sql}
-          UNION
-            #{board_grant_query.to_sql}
-        )
-        SELECT task_type, decision_review_type, COUNT(1)
-        FROM task_review_issues
-        GROUP BY task_type, decision_review_type;
-      SQL
-
-      task_count.reduce({}) do |acc, item|
-        key = [item["task_type"], item["decision_review_type"]]
-        acc[key] = (acc[key] || 0) + item["count"]
-        acc
-      end
-    end
-
-    def issue_type_count
-      appeals_query = issue_type_query_helper(ama_appeal: :request_issues)
-      hlr_query = issue_type_query_helper(higher_level_review: :request_issues)
-      sc_query = issue_type_query_helper(supplemental_claim: :request_issues)
 
       nonrating_issue_count = ActiveRecord::Base.connection.execute <<-SQL
         WITH task_review_issues AS (
             #{hlr_query.to_sql}
-          UNION
+          UNION ALL
             #{sc_query.to_sql}
-          UNION
+          UNION ALL
             #{appeals_query.to_sql}
         )
         SELECT issue_category, COUNT(1) AS nonrating_issue_count
@@ -243,19 +197,19 @@ def issue_type_count
 
       issue_count_options
     end
+    # rubocop:enable Metrics/AbcSize
 
     def change_history_rows
       # Generate all of the filter queries to be used in both the HLR and SC block
       sql = Arel.sql(change_history_sql_filter_array.join(" "))
       sanitized_filters = ActiveRecord::Base.sanitize_sql_array([sql])
-      sc_type_clauses = ActiveRecord::Base.sanitize_sql_array([sc_type_filter])
 
       change_history_sql_block = <<-SQL
         WITH versions_agg AS NOT MATERIALIZED (
           SELECT
               versions.item_id,
               versions.item_type,
-              STRING_AGG(versions.object_changes, '|||' ORDER BY versions.id) AS object_changes_array,
+              ARRAY_AGG(versions.object_changes ORDER BY versions.id) AS object_changes_array,
               MAX(CASE
                   WHEN versions.object_changes LIKE '%closed_at:%' THEN versions.whodunnit
                   ELSE NULL
@@ -268,48 +222,8 @@ def change_history_rows
             AND tasks.assigned_to_id = '#{parent.id.to_i}'
           GROUP BY
               versions.item_id, versions.item_type
-        ), imr_version_agg AS (SELECT
-              versions.item_id,
-              versions.item_type,
-              STRING_AGG(versions.object, '|||' ORDER BY versions.id) AS object_array,
-              STRING_AGG(versions.object_changes, '|||' ORDER BY versions.id) AS object_changes_array
-          FROM
-              versions
-          INNER JOIN issue_modification_requests ON issue_modification_requests.id = versions.item_id
-          WHERE versions.item_type = 'IssueModificationRequest'
-          GROUP BY
-              versions.item_id, versions.item_type
-        ), imr_distinct AS (
-            SELECT DISTINCT ON (imr_cte.id)
-                imr_cte.id,
-                imr_cte.decided_at,
-                imr_cte.created_at,
-                imr_cte.decision_review_type,
-                imr_cte.decision_review_id,
-                imr_cte.status,
-                imr_cte.updated_at
-            FROM issue_modification_requests imr_cte
-        ), imr_lead_decided AS (
-            SELECT id,
-                  decision_review_id,
-                  LEAD(
-                    CASE
-                      WHEN status = 'cancelled' THEN updated_at
-                      ELSE decided_at
-                    END,
-                    1,
-                    '9999-12-31 23:59:59' -- Fake value to indicate out of bounds
-                  ) OVER (PARTITION BY decision_review_id, decision_review_type ORDER BY decided_at, created_at DESC) AS next_decided_or_cancelled_at
-            FROM imr_distinct
-        ), imr_lead_created AS (
-            SELECT id,
-                LEAD(created_at, 1, '9999-12-31 23:59:59') OVER (PARTITION BY decision_review_id, decision_review_type ORDER BY created_at ASC) AS next_created_at
-            FROM imr_distinct
         )
-        SELECT tasks.id AS task_id,
-          check_imr_current_status.is_assigned_present,
-          tasks.status AS task_status,
-          request_issues.id AS request_issue_id,
+        SELECT tasks.id AS task_id, tasks.status AS task_status, request_issues.id AS request_issue_id,
           request_issues_updates.created_at AS request_issue_update_time, decision_issues.description AS decision_description,
           request_issues.benefit_type AS request_issue_benefit_type, request_issues_updates.id AS request_issue_update_id,
           request_issues.created_at AS request_issue_created_at, request_decision_issues.created_at AS request_decision_created_at,
@@ -332,38 +246,7 @@ def change_history_rows
             NULLIF(CONCAT(unrecognized_party_details.name, ' ', unrecognized_party_details.last_name), ' '),
             NULLIF(CONCAT(people.first_name, ' ', people.last_name), ' '),
             bgs_attorneys.name
-          ) AS claimant_name,
-          'HigherLevelReview' AS type_classifier,
-          imr.id AS issue_modification_request_id,
-          imr.nonrating_issue_category AS requested_issue_type,
-          imr.nonrating_issue_description As requested_issue_description,
-          imr.remove_original_issue,
-          imr.request_reason AS modification_request_reason,
-          imr.decision_date AS requested_decision_date,
-          imr.request_type AS request_type,
-          imr.status AS issue_modification_request_status,
-          imr.decision_reason AS decision_reason,
-          imr.decider_id decider_id,
-          imr.requestor_id as requestor_id,
-          CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END AS decided_at,
-          imr.created_at AS issue_modification_request_created_at,
-          imr.updated_at AS issue_modification_request_updated_at,
-          imr.edited_at AS issue_modification_request_edited_at,
-          imr.withdrawal_date AS issue_modification_request_withdrawal_date,
-          imr.decision_review_id AS decision_review_id,
-          imr.decision_review_type AS decision_review_type,
-          requestor.full_name AS requestor,
-          requestor.station_id AS requestor_station_id,
-          requestor.css_id AS requestor_css_id,
-          decider.full_name AS decider,
-          decider.station_id AS decider_station_id,
-          decider.css_id AS decider_css_id,
-          itv.object_changes_array AS imr_versions,
-          LAG(imr.created_at, 1) OVER (PARTITION BY tasks.id, imr.decision_review_id, imr.decision_review_type ORDER BY imr.created_at) AS previous_imr_created_at,
-          LAG(CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END) OVER (PARTITION BY tasks.id, imr.decision_review_id, imr.decision_review_type ORDER BY CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END) AS previous_imr_decided_at,
-          itv.object_array as previous_state_array,
-          imr_lead_decided.next_decided_or_cancelled_at,
-          imr_lead_created.next_created_at
+          ) AS claimant_name
         FROM tasks
         INNER JOIN request_issues ON request_issues.decision_review_type = tasks.appeal_type
         AND request_issues.decision_review_id = tasks.appeal_id
@@ -373,18 +256,6 @@ def change_history_rows
         AND intakes.detail_id = tasks.appeal_id
         LEFT JOIN request_issues_updates ON request_issues_updates.review_type = tasks.appeal_type
         AND request_issues_updates.review_id = tasks.appeal_id
-        LEFT JOIN LATERAL (
-          SELECT *
-          FROM issue_modification_requests imr
-          WHERE imr.decision_review_id = tasks.appeal_id
-            AND imr.decision_review_type = 'HigherLevelReview'
-            AND (
-                imr.request_issue_id = request_issues.id
-                OR imr.request_type = 'addition'
-            )
-        ) imr ON true
-        LEFT JOIN imr_lead_decided ON imr_lead_decided.id = imr.id
-        LEFT JOIN imr_lead_created ON imr_lead_created.id = imr.id
         LEFT JOIN request_decision_issues ON request_decision_issues.request_issue_id = request_issues.id
         LEFT JOIN decision_issues ON decision_issues.decision_review_id = tasks.appeal_id
         AND decision_issues.decision_review_type = tasks.appeal_type AND decision_issues.id = request_decision_issues.decision_issue_id
@@ -399,136 +270,62 @@ def change_history_rows
         LEFT JOIN users update_users ON request_issues_updates.user_id = update_users.id
         LEFT JOIN users decision_users ON decision_users.id = tv.version_closed_by_id::int
         LEFT JOIN users decision_users_completed_by ON decision_users_completed_by.id = tasks.completed_by_id
-        LEFT JOIN users requestor ON imr.requestor_id = requestor.id
-        LEFT JOIN users decider ON imr.decider_id = decider.id
-        LEFT JOIN imr_version_agg itv ON itv.item_type = 'IssueModificationRequest' AND itv.item_id = imr.id
-        LEFT JOIN LATERAL (
-             SELECT CASE
-           WHEN EXISTS (
-             SELECT 1
-             FROM issue_modification_requests imr
-             WHERE imr.decision_review_id = request_issues.decision_review_id
-             AND imr.decision_review_type = 'HigherLevelReview'
-               AND imr.status = 'assigned'
-           ) THEN true
-           ELSE false
-       END AS is_assigned_present
-         ) check_imr_current_status on true
         WHERE tasks.type = 'DecisionReviewTask'
         AND tasks.assigned_to_type = 'Organization'
         AND tasks.assigned_to_id = '#{parent.id.to_i}'
         #{sanitized_filters}
-      UNION ALL
-      SELECT tasks.id AS task_id, check_imr_current_status.is_assigned_present, tasks.status AS task_status, request_issues.id AS request_issue_id,
-        request_issues_updates.created_at AS request_issue_update_time, decision_issues.description AS decision_description,
-        request_issues.benefit_type AS request_issue_benefit_type, request_issues_updates.id AS request_issue_update_id,
-        request_issues.created_at AS request_issue_created_at, request_decision_issues.created_at AS request_decision_created_at,
-        intakes.completed_at AS intake_completed_at, update_users.full_name AS update_user_name, tasks.created_at AS task_created_at,
-        intake_users.full_name AS intake_user_name, update_users.station_id AS update_user_station_id, tasks.closed_at AS task_closed_at,
-        intake_users.station_id AS intake_user_station_id, decision_issues.created_at AS decision_created_at,
-        COALESCE(decision_users.station_id, decision_users_completed_by.station_id) AS decision_user_station_id,
-        COALESCE(decision_users.full_name, decision_users_completed_by.full_name) AS decision_user_name,
-        COALESCE(decision_users.css_id, decision_users_completed_by.css_id) AS decision_user_css_id,
-        intake_users.css_id AS intake_user_css_id, update_users.css_id AS update_user_css_id,
-        request_issues_updates.before_request_issue_ids, request_issues_updates.after_request_issue_ids,
-        request_issues_updates.withdrawn_request_issue_ids, request_issues_updates.edited_request_issue_ids,
-        decision_issues.caseflow_decision_date, request_issues.decision_date_added_at,
-        tasks.appeal_type, tasks.appeal_id, request_issues.nonrating_issue_category, request_issues.nonrating_issue_description,
-        request_issues.decision_date, decision_issues.disposition, tasks.assigned_at, request_issues.unidentified_issue_text,
-        request_decision_issues.decision_issue_id, request_issues.closed_at AS request_issue_closed_at,
-        tv.object_changes_array AS task_versions, (CURRENT_TIMESTAMP::date - tasks.assigned_at::date) AS days_waiting,
-        COALESCE(intakes.veteran_file_number, supplemental_claims.veteran_file_number) AS veteran_file_number,
-        COALESCE(
-          NULLIF(CONCAT(unrecognized_party_details.name, ' ', unrecognized_party_details.last_name), ' '),
-          NULLIF(CONCAT(people.first_name, ' ', people.last_name), ' '),
-          bgs_attorneys.name
-        ) AS claimant_name,
-         supplemental_claims.type AS type_classifier,
-         imr.id AS issue_modification_request_id,
-         imr.nonrating_issue_category AS requested_issue_type,
-         imr.nonrating_issue_description As requested_issue_description,
-         imr.remove_original_issue,
-         imr.request_reason AS modification_request_reason,
-         imr.decision_date AS requested_decision_date,
-         imr.request_type AS request_type,
-         imr.status AS issue_modification_request_status,
-         imr.decision_reason AS decision_reason,
-         imr.decider_id AS decider_id,
-         imr.requestor_id AS requestor_id,
-         CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END AS decided_at,
-         imr.created_at AS issue_modification_request_created_at,
-         imr.updated_at  AS issue_modification_request_updated_at,
-         imr.edited_at AS issue_modification_request_edited_at,
-         imr.withdrawal_date  AS issue_modification_request_withdrawal_date,
-         imr.decision_review_id  AS decision_review_id,
-         imr.decision_review_type AS decision_review_type,
-         requestor.full_name AS requestor,
-         requestor.station_id AS requestor_station_id,
-         requestor.css_id AS requestor_css_id,
-         decider.full_name AS decider,
-         decider.station_id AS decider_station_id,
-         decider.css_id AS decider_css_id,
-         itv.object_changes_array AS imr_versions,
-         LAG(imr.created_at, 1) OVER (PARTITION BY tasks.id, imr.decision_review_id, imr.decision_review_type ORDER BY imr.created_at) AS previous_imr_created_at,
-         LAG(CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END) OVER (PARTITION BY tasks.id, imr.decision_review_id, imr.decision_review_type ORDER BY CASE WHEN imr.status = 'cancelled' THEN imr.updated_at ELSE imr.decided_at END) AS previous_imr_decided_at,
-         itv.object_array as previous_state_array,
-         imr_lead_decided.next_decided_or_cancelled_at,
-         imr_lead_created.next_created_at
-      FROM tasks
-      INNER JOIN request_issues ON request_issues.decision_review_type = tasks.appeal_type
-      AND request_issues.decision_review_id = tasks.appeal_id
-      INNER JOIN supplemental_claims ON tasks.appeal_type = 'SupplementalClaim'
-      AND tasks.appeal_id = supplemental_claims.id
-      LEFT JOIN intakes ON tasks.appeal_type = intakes.detail_type
-      AND intakes.detail_id = tasks.appeal_id
-      LEFT JOIN request_issues_updates ON request_issues_updates.review_type = tasks.appeal_type
-      AND request_issues_updates.review_id = tasks.appeal_id
-      LEFT JOIN LATERAL (
-        SELECT *
-        FROM issue_modification_requests imr
-        WHERE imr.decision_review_id = tasks.appeal_id
-          AND imr.decision_review_type = 'SupplementalClaim'
-          AND (
-              imr.request_issue_id = request_issues.id
-              OR imr.request_type = 'addition'
-          )
-      ) imr ON true
-      LEFT JOIN imr_lead_decided ON imr_lead_decided.id = imr.id
-      LEFT JOIN imr_lead_created ON imr_lead_created.id = imr.id
-      LEFT JOIN request_decision_issues ON request_decision_issues.request_issue_id = request_issues.id
-      LEFT JOIN decision_issues ON decision_issues.decision_review_id = tasks.appeal_id
-      AND decision_issues.decision_review_type = tasks.appeal_type AND decision_issues.id = request_decision_issues.decision_issue_id
-      LEFT JOIN claimants ON claimants.decision_review_id = tasks.appeal_id
-      AND claimants.decision_review_type = tasks.appeal_type
-      LEFT JOIN versions_agg tv ON tv.item_type = 'Task' AND tv.item_id = tasks.id
-      LEFT JOIN people ON claimants.participant_id = people.participant_id
-      LEFT JOIN bgs_attorneys ON claimants.participant_id = bgs_attorneys.participant_id
-      LEFT JOIN unrecognized_appellants ON claimants.id = unrecognized_appellants.claimant_id
-      LEFT JOIN unrecognized_party_details ON unrecognized_appellants.unrecognized_party_detail_id = unrecognized_party_details.id
-      LEFT JOIN users intake_users ON intakes.user_id = intake_users.id
-      LEFT JOIN users update_users ON request_issues_updates.user_id = update_users.id
-      LEFT JOIN users decision_users ON decision_users.id = tv.version_closed_by_id::int
-      LEFT JOIN users decision_users_completed_by ON decision_users_completed_by.id = tasks.completed_by_id
-      LEFT JOIN users requestor ON imr.requestor_id  = requestor.id
-      LEFT JOIN users decider ON  imr.decider_id  = decider.id
-      LEFT JOIN imr_version_agg itv ON itv.item_type = 'IssueModificationRequest' AND itv.item_id = imr.id
-      LEFT JOIN LATERAL (
-             SELECT CASE
-           WHEN EXISTS (
-             SELECT 1
-             FROM issue_modification_requests imr
-             WHERE imr.decision_review_id = request_issues.decision_review_id
-             AND imr.decision_review_type = 'SupplementalClaim'
-               AND imr.status = 'assigned'
-           ) THEN true
-           ELSE false
-       END AS is_assigned_present
-         ) check_imr_current_status on true
-      WHERE tasks.type = 'DecisionReviewTask'
-      AND tasks.assigned_to_type = 'Organization'
-      AND tasks.assigned_to_id = '#{parent.id.to_i}'
-      #{sanitized_filters}
-      #{sc_type_clauses}
+        UNION ALL
+        SELECT tasks.id AS task_id, tasks.status AS task_status, request_issues.id AS request_issue_id,
+          request_issues_updates.created_at AS request_issue_update_time, decision_issues.description AS decision_description,
+          request_issues.benefit_type AS request_issue_benefit_type, request_issues_updates.id AS request_issue_update_id,
+          request_issues.created_at AS request_issue_created_at, request_decision_issues.created_at AS request_decision_created_at,
+          intakes.completed_at AS intake_completed_at, update_users.full_name AS update_user_name, tasks.created_at AS task_created_at,
+          intake_users.full_name AS intake_user_name, update_users.station_id AS update_user_station_id, tasks.closed_at AS task_closed_at,
+          intake_users.station_id AS intake_user_station_id, decision_issues.created_at AS decision_created_at,
+          COALESCE(decision_users.station_id, decision_users_completed_by.station_id) AS decision_user_station_id,
+          COALESCE(decision_users.full_name, decision_users_completed_by.full_name) AS decision_user_name,
+          COALESCE(decision_users.css_id, decision_users_completed_by.css_id) AS decision_user_css_id,
+          intake_users.css_id AS intake_user_css_id, update_users.css_id AS update_user_css_id,
+          request_issues_updates.before_request_issue_ids, request_issues_updates.after_request_issue_ids,
+          request_issues_updates.withdrawn_request_issue_ids, request_issues_updates.edited_request_issue_ids,
+          decision_issues.caseflow_decision_date, request_issues.decision_date_added_at,
+          tasks.appeal_type, tasks.appeal_id, request_issues.nonrating_issue_category, request_issues.nonrating_issue_description,
+          request_issues.decision_date, decision_issues.disposition, tasks.assigned_at, request_issues.unidentified_issue_text,
+          request_decision_issues.decision_issue_id, request_issues.closed_at AS request_issue_closed_at,
+          tv.object_changes_array AS task_versions, (CURRENT_TIMESTAMP::date - tasks.assigned_at::date) AS days_waiting,
+          COALESCE(intakes.veteran_file_number, supplemental_claims.veteran_file_number) AS veteran_file_number,
+          COALESCE(
+            NULLIF(CONCAT(unrecognized_party_details.name, ' ', unrecognized_party_details.last_name), ' '),
+            NULLIF(CONCAT(people.first_name, ' ', people.last_name), ' '),
+            bgs_attorneys.name
+          ) AS claimant_name
+        FROM tasks
+        INNER JOIN request_issues ON request_issues.decision_review_type = tasks.appeal_type
+        AND request_issues.decision_review_id = tasks.appeal_id
+        INNER JOIN supplemental_claims ON tasks.appeal_type = 'SupplementalClaim'
+        AND tasks.appeal_id = supplemental_claims.id
+        LEFT JOIN intakes ON tasks.appeal_type = intakes.detail_type
+        AND intakes.detail_id = tasks.appeal_id
+        LEFT JOIN request_issues_updates ON request_issues_updates.review_type = tasks.appeal_type
+        AND request_issues_updates.review_id = tasks.appeal_id
+        LEFT JOIN request_decision_issues ON request_decision_issues.request_issue_id = request_issues.id
+        LEFT JOIN decision_issues ON decision_issues.decision_review_id = tasks.appeal_id
+        AND decision_issues.decision_review_type = tasks.appeal_type AND decision_issues.id = request_decision_issues.decision_issue_id
+        LEFT JOIN claimants ON claimants.decision_review_id = tasks.appeal_id
+        AND claimants.decision_review_type = tasks.appeal_type
+        LEFT JOIN versions_agg tv ON tv.item_type = 'Task' AND tv.item_id = tasks.id
+        LEFT JOIN people ON claimants.participant_id = people.participant_id
+        LEFT JOIN bgs_attorneys ON claimants.participant_id = bgs_attorneys.participant_id
+        LEFT JOIN unrecognized_appellants ON claimants.id = unrecognized_appellants.claimant_id
+        LEFT JOIN unrecognized_party_details ON unrecognized_appellants.unrecognized_party_detail_id = unrecognized_party_details.id
+        LEFT JOIN users intake_users ON intakes.user_id = intake_users.id
+        LEFT JOIN users update_users ON request_issues_updates.user_id = update_users.id
+        LEFT JOIN users decision_users ON decision_users.id = tv.version_closed_by_id::int
+        LEFT JOIN users decision_users_completed_by ON decision_users_completed_by.id = tasks.completed_by_id
+        WHERE tasks.type = 'DecisionReviewTask'
+        AND tasks.assigned_to_type = 'Organization'
+        AND tasks.assigned_to_id = '#{parent.id.to_i}'
+        #{sanitized_filters}
       SQL
 
       ActiveRecord::Base.transaction do
@@ -560,63 +357,17 @@ def change_history_sql_filter_array
 
     def task_status_filter
       if query_params[:task_status].present?
-        task_specific_status_filter
+        " AND #{where_clause_from_array(Task, :status, query_params[:task_status]).to_sql}"
       else
         " AND tasks.status IN ('assigned', 'in_progress', 'on_hold', 'completed', 'cancelled') "
       end
     end
 
-    def task_specific_status_filter
-      if query_params[:task_status].include?("pending")
-        task_status_pending_filter
-      else
-        task_status_without_pending_filter
-      end
-    end
-
-    def task_status_pending_filter
-      <<-SQL
-       AND (
-        (imr.id IS NOT NULL AND imr.status = 'assigned')
-        OR #{where_clause_from_array(Task, :status, query_params[:task_status].uniq).to_sql}
-       )
-      SQL
-    end
-
-    def task_status_without_pending_filter
-      <<-SQL
-         AND NOT EXISTS(
-             SELECT decision_review_id FROM issue_modification_requests WHERE
-             issue_modification_requests.status = 'assigned'
-             AND issue_modification_requests.decision_review_id = tasks.appeal_id
-             AND tasks.appeal_type = issue_modification_requests.decision_review_type)
-        AND #{where_clause_from_array(Task, :status, query_params[:task_status].uniq).to_sql}
-      SQL
-    end
-
     def claim_type_filter
       if query_params[:claim_type].present?
-        temp_claim_types = query_params[:claim_type].dup
-
-        if query_params[:claim_type].include?(Remand.name)
-          temp_claim_types.push "SupplementalClaim"
-        end
-
-        " AND #{where_clause_from_array(Task, :appeal_type, temp_claim_types).to_sql} "
-      else
-        " AND tasks.appeal_type IN ('HigherLevelReview', 'SupplementalClaim' ) "
-      end
-    end
-
-    def sc_type_filter
-      if query_params[:claim_type].present?
-        if query_params[:claim_type].include?(Remand.name) || query_params[:claim_type].include?(SupplementalClaim.name)
-          " AND #{where_clause_from_array(SupplementalClaim, :type, query_params[:claim_type]).to_sql} "
-        else
-          ""
-        end
+        " AND #{where_clause_from_array(Task, :appeal_type, query_params[:claim_type]).to_sql}"
       else
-        ""
+        " AND tasks.appeal_type IN ('HigherLevelReview', 'SupplementalClaim') "
       end
     end
 
@@ -669,16 +420,19 @@ def days_waiting_filter
       end
     end
 
+    # rubocop:disable Metrics/AbcSize
     def station_id_filter
       if query_params[:facilities].present?
-        conditions = USER_TABLE_ALIASES.map do |alias_name|
-          User.arel_table.alias(alias_name)[:station_id].in(query_params[:facilities]).to_sql
-        end
-
         <<-SQL
           AND
           (
-            #{conditions.join(' OR ')}
+            #{User.arel_table.alias(:intake_users)[:station_id].in(query_params[:facilities]).to_sql}
+            OR
+            #{User.arel_table.alias(:update_users)[:station_id].in(query_params[:facilities]).to_sql}
+            OR
+            #{User.arel_table.alias(:decision_users)[:station_id].in(query_params[:facilities]).to_sql}
+            OR
+            #{User.arel_table.alias(:decision_users_completed_by)[:station_id].in(query_params[:facilities]).to_sql}
           )
         SQL
       end
@@ -686,18 +440,21 @@ def station_id_filter
 
     def user_css_id_filter
       if query_params[:personnel].present?
-        conditions = USER_TABLE_ALIASES.map do |alias_name|
-          User.arel_table.alias(alias_name)[:css_id].in(query_params[:personnel]).to_sql
-        end
-
         <<-SQL
           AND
           (
-            #{conditions.join(' OR ')}
+            #{User.arel_table.alias(:intake_users)[:css_id].in(query_params[:personnel]).to_sql}
+            OR
+            #{User.arel_table.alias(:update_users)[:css_id].in(query_params[:personnel]).to_sql}
+            OR
+            #{User.arel_table.alias(:decision_users)[:css_id].in(query_params[:personnel]).to_sql}
+            OR
+            #{User.arel_table.alias(:decision_users_completed_by)[:css_id].in(query_params[:personnel]).to_sql}
           )
         SQL
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     #################### End of Change history filter helpers ########################
 
@@ -871,7 +628,7 @@ def search_all_clause
     def group_by_columns
       "tasks.id, uuid, veterans.participant_id, veterans.ssn, veterans.first_name, veterans.last_name, "\
       "unrecognized_party_details.name, unrecognized_party_details.last_name, people.first_name, people.last_name, "\
-      "veteran_is_not_claimant, bgs_attorneys.name, sub_type"
+      "veteran_is_not_claimant, bgs_attorneys.name"
     end
 
     # Uses an array to insert the searched text into all of the searchable fields since it's the same text for all
@@ -881,26 +638,21 @@ def search_values
     end
 
     def higher_level_reviews_on_request_issues
-      sub_type_alias = "'HigherLevelReview' AS sub_type"
-      decision_reviews_on_request_issues({ higher_level_review: :request_issues }, sub_type_alias)
+      decision_reviews_on_request_issues(higher_level_review: :request_issues)
     end
 
     def supplemental_claims_on_request_issues
-      sub_type_alias = "supplemental_claims.type AS sub_type"
-      decision_reviews_on_request_issues({ supplemental_claim: :request_issues }, sub_type_alias)
+      decision_reviews_on_request_issues(supplemental_claim: :request_issues)
     end
 
     def appeals_on_request_issues
-      sub_type_alias = "'Appeal' as sub_type"
-      decision_reviews_on_request_issues({ ama_appeal: :request_issues }, sub_type_alias)
+      decision_reviews_on_request_issues(ama_appeal: :request_issues)
     end
 
     # Specific case for BoardEffectuationGrantTasks to include them in the result set
     # if the :board_grant_effectuation_task FeatureToggle is enabled for the current user.
     def board_grant_effectuation_tasks
-      sub_type_alias = "'Appeal' as sub_type"
       decision_reviews_on_request_issues(board_grant_effectuation_task_appeals_requests_join,
-                                         sub_type_alias,
                                          board_grant_effectuation_task_constraints)
     end
 
@@ -915,8 +667,8 @@ def ama_appeals_query
       appeals_on_request_issues
     end
 
-    def decision_reviews_on_request_issues(join_constraint, subclass_type_alias, where_constraints = query_constraints)
-      Task.select(union_select_statements.append(subclass_type_alias))
+    def decision_reviews_on_request_issues(join_constraint, where_constraints = query_constraints)
+      Task.select(union_select_statements)
         .send(parent.tasks_query_type[query_type])
         .joins(join_constraint)
         .joins(*union_query_join_clauses)
diff --git a/app/models/remand.rb b/app/models/remand.rb
deleted file mode 100644
index 987220c7c3e..00000000000
--- a/app/models/remand.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class Remand < SupplementalClaim
-end
diff --git a/app/models/supplemental_claim.rb b/app/models/supplemental_claim.rb
index ab9312d8758..014dea14a0b 100644
--- a/app/models/supplemental_claim.rb
+++ b/app/models/supplemental_claim.rb
@@ -12,8 +12,6 @@ class SupplementalClaim < ClaimReview
       .where("#{table_name}.decision_review_remanded_type='Appeal'")
   }
 
-  scope :remand, -> { where(type: Remand.name) }
-
   attr_accessor :appeal_split_process
 
   def ui_hash
diff --git a/app/models/tasks/timed_hold_task.rb b/app/models/tasks/timed_hold_task.rb
index 0363dc0786e..6399711c994 100644
--- a/app/models/tasks/timed_hold_task.rb
+++ b/app/models/tasks/timed_hold_task.rb
@@ -55,7 +55,7 @@ def timer_end_time
     # Since we expect to always instantiate TimedHoldTasks with a delay we need to take that into account
     # to know when the timer will complete.
     #
-    # https://github.com/department-of-veterans-affairs/caseflow/blob/main/app/models/concerns/asyncable.rb#L125
+    # https://github.com/department-of-veterans-affairs/caseflow/blob/master/app/models/concerns/asyncable.rb#L125
     #
     # If we allow TimedHoldTasks to be submitted without delay this will need to change.
     task_timers.first ? task_timers.first.last_submitted_at + TaskTimer.processing_retry_interval_hours.hours : nil
diff --git a/app/services/business_line_reporter.rb b/app/services/business_line_reporter.rb
index 92637539d58..1ac8490b042 100644
--- a/app/services/business_line_reporter.rb
+++ b/app/services/business_line_reporter.rb
@@ -26,7 +26,7 @@ def as_csv
         csv << [
           business_line.name,
           task.appeal_id,
-          task.appeal.class.review_title,
+          task.appeal_type,
           task.appeal.claimant&.name,
           task.appeal.request_issues.size,
           task.appeal.decision_issues.size,
diff --git a/app/services/claim_change_history/change_history_event_serializer.rb b/app/services/claim_change_history/change_history_event_serializer.rb
index 5bd16ea05e9..5b8bca631ce 100644
--- a/app/services/claim_change_history/change_history_event_serializer.rb
+++ b/app/services/claim_change_history/change_history_event_serializer.rb
@@ -24,27 +24,4 @@ class ChangeHistoryEventSerializer
       withdrawalRequestDate: object.withdrawal_request_date
     }
   end
-
-  attribute :modificationRequestDetails do |object|
-    {
-      requestType: object.request_type,
-      benefitType: object.benefit_type,
-      newIssueType: object.new_issue_type,
-      newIssueDescription: object.new_issue_description,
-      newDecisionDate: object.new_decision_date,
-      modificationRequestReason: object.modification_request_reason,
-      issueModificationRequestWithdrawalDate: object.issue_modification_request_withdrawal_date,
-      removeOriginalIssue: object.remove_original_issue,
-      issueModificationRequestStatus: object.issue_modification_request_status,
-      requestor: object.requestor,
-      decider: object.decider,
-      decidedAtDate: object.decided_at_date,
-      decisionReason: object.decision_reason,
-      previousIssueType: object.previous_issue_type,
-      previousIssueDescription: object.previous_issue_description,
-      previousDecisionDate: object.previous_decision_date,
-      previousModificationRequestReason: object.previous_modification_request_reason,
-      previousWithdrawalDate: object.previous_withdrawal_date
-    }
-  end
 end
diff --git a/app/services/claim_change_history/change_history_filter_parser.rb b/app/services/claim_change_history/change_history_filter_parser.rb
index 4fbcd6b2826..2e423e43e13 100644
--- a/app/services/claim_change_history/change_history_filter_parser.rb
+++ b/app/services/claim_change_history/change_history_filter_parser.rb
@@ -25,7 +25,6 @@ def parse_filters
 
   private
 
-  # rubocop:disable Metrics/MethodLength
   def events_filter_helper
     event_mapping = {
       "added_decision_date" => :added_decision_date,
@@ -35,32 +34,21 @@ def events_filter_helper
       "claim_closed" => [:completed, :cancelled],
       "claim_status_incomplete" => :incomplete,
       "claim_status_inprogress" => :in_progress,
-      "claim_status_pending" => :pending,
       "completed_disposition" => :completed_disposition,
       "removed_issue" => :removed_issue,
       "withdrew_issue" => :withdrew_issue,
-      "claim_cancelled" => :cancelled,
-      "requested_issue_modification" => :modification,
-      "requested_issue_addition" => :addition,
-      "requested_issue_removal" => :removal,
-      "requested_issue_withdrawal" => :withdrawal,
-      "approval_of_request" => :request_approved,
-      "rejection_of_request" => :request_denied,
-      "cancellation_of_request" => :request_cancelled,
-      "edit_of_request" => :request_edited
+      "claim_cancelled" => :cancelled
     }
 
     filter_params[:events]&.values&.map { |event_type| event_mapping[event_type] }&.flatten
   end
-  # rubocop:enable Metrics/MethodLength
 
   def task_status_filter_helper
     status_mapping = {
       "incomplete" => "on_hold",
       "in_progress" => %w[assigned in_progress],
       "completed" => "completed",
-      "cancelled" => "cancelled",
-      "pending" => "pending"
+      "cancelled" => "cancelled"
     }
 
     filter_params[:statuses]&.values&.map { |task_status| status_mapping[task_status] }&.flatten
diff --git a/app/services/claim_change_history/change_history_reporter.rb b/app/services/claim_change_history/change_history_reporter.rb
index 8025b63d60e..68cf043c19c 100644
--- a/app/services/claim_change_history/change_history_reporter.rb
+++ b/app/services/claim_change_history/change_history_reporter.rb
@@ -18,12 +18,7 @@ class ChangeHistoryReporter
     Edit\ Action
     Issue\ Type
     Issue\ Description
-    Decision\ Date
-    New\ Issue\ Type
-    New\ Issue\ Description
-    New\ Decision\ Date
-    Request\ Reason
-    Reason\ for\ Rejection
+    Prior\ Decision\ Date
     Disposition
     Disposition\ Description
     Disposition\ Date
diff --git a/app/services/claim_change_history/claim_history_event.rb b/app/services/claim_change_history/claim_history_event.rb
index fd80259e661..0cae36dc208 100644
--- a/app/services/claim_change_history/claim_history_event.rb
+++ b/app/services/claim_change_history/claim_history_event.rb
@@ -15,12 +15,7 @@ class ClaimHistoryEvent
               :benefit_type, :issue_type, :issue_description, :decision_date,
               :disposition, :decision_description, :withdrawal_request_date,
               :task_status, :disposition_date, :intake_completed_date, :event_user_name,
-              :event_user_css_id, :new_issue_type, :new_issue_description, :new_decision_date,
-              :modification_request_reason, :request_type, :decision_reason, :decided_at_date,
-              :issue_modification_request_withdrawal_date, :requestor,
-              :decider, :remove_original_issue, :issue_modification_request_status,
-              :previous_issue_type, :previous_issue_description, :previous_decision_date,
-              :previous_modification_request_reason, :previous_withdrawal_date
+              :event_user_css_id
 
   EVENT_TYPES = [
     :completed_disposition,
@@ -33,16 +28,7 @@ class ClaimHistoryEvent
     :in_progress,
     :completed,
     :incomplete,
-    :cancelled,
-    :pending,
-    :modification,
-    :addition,
-    :withdrawal,
-    :removal,
-    :request_approved,
-    :request_denied,
-    :request_cancelled,
-    :request_edited
+    :cancelled
   ].freeze
 
   ISSUE_EVENTS = [
@@ -61,31 +47,10 @@ class ClaimHistoryEvent
     :added_decision_date
   ].freeze
 
-  STATUS_EVENTS = [
-    :completed,
-    :claim_creation,
-    :cancelled,
-    :in_progress,
-    :incomplete,
-    :pending
-  ].freeze
-
-  REQUEST_ISSUE_MODIFICATION_EVENTS = [
-    :modification,
-    :addition,
-    :withdrawal,
-    :removal,
-    :request_approved,
-    :request_denied,
-    :request_cancelled,
-    :request_edited
-  ].freeze
+  STATUS_EVENTS = [:in_progress, :incomplete, :completed, :claim_creation, :cancelled].freeze
 
   REQUEST_ISSUE_TIME_WINDOW = 15
   STATUS_EVENT_TIME_WINDOW = 2
-  ISSUE_MODIFICATION_REQUEST_CREATION_WINDOW = 60
-  # Used to signal when the database lead function is out of bounds
-  OUT_OF_BOUNDS_LEAD_TIME = Time.utc(9999, 12, 31, 23, 59, 59)
 
   class << self
     def from_change_data(event_type, change_data)
@@ -108,242 +73,11 @@ def create_claim_creation_event(change_data)
       from_change_data(:claim_creation, change_data.merge(intake_event_hash(change_data)))
     end
 
-    def create_issue_modification_request_event(change_data)
-      issue_modification_events = []
-      request_type = change_data["request_type"]
-      event_hash = request_issue_modification_event_hash(change_data)
-
-      if change_data["previous_state_array"].present?
-        first_version = parse_versions(change_data["previous_state_array"])[0]
-        event_hash.merge!(update_event_hash_data_from_version_object(first_version))
-      end
-
-      if request_type == "addition"
-        change_data = issue_attributes_for_request_type_addition(change_data)
-      end
-
-      issue_modification_events.push from_change_data(request_type.to_sym, change_data.merge(event_hash))
-    end
-
-    def create_edited_request_issue_events(change_data)
-      edited_events = []
-      imr_versions = parse_versions(change_data["imr_versions"])
-      previous_version = parse_versions(change_data["previous_state_array"])
-
-      if imr_versions.present?
-        *rest_of_versions, last_version = imr_versions
-
-        if last_version["status"].present?
-          edited_events.push(*create_last_version_events(change_data, last_version))
-        else
-          rest_of_versions.push(last_version)
-        end
-        edited_events.push(*create_event_from_rest_of_versions(change_data, rest_of_versions, previous_version))
-      else
-        create_pending_status_event(change_data, change_data["issue_modification_request_updated_at"])
-      end
-      edited_events
-    end
-
-    def create_event_from_rest_of_versions(change_data, edited_versions, previous_version)
-      edit_of_request_events = []
-      event_type = :request_edited
-      event_date_hash = {}
-      edited_versions.map.with_index do |version, index|
-        event_date_hash = request_issue_modification_event_hash(change_data)
-          .merge("event_date" => version["updated_at"][1])
-        # this create_event_from_version_object updated the previous version fields in change data
-        # that is being used in the front end to show the original records.
-        if !previous_version[index].nil?
-          event_date_hash.merge!(create_event_from_version_object(previous_version[index]))
-          # this update_event_hash_data_from_version_object updates the change_data values with previous or
-          # unedited data. since change_data has the final version of the data that was updated.
-          # this is necessary to preserve the history that is displayed in the frontend.
-          event_date_hash.merge!(update_event_hash_data_from_version_object(previous_version[index]))
-        end
-
-        event_date_hash.merge!(update_event_hash_data_from_version(version, 1))
-        edit_of_request_events.push(*from_change_data(event_type, change_data.merge(event_date_hash)))
-      end
-      edit_of_request_events
-    end
-
-    def create_last_version_events(change_data, last_version)
-      edited_events = []
-
-      last_version["status"].map.with_index do |status, index|
-        if status == "assigned"
-          edited_events.push(*create_pending_status_event(change_data, last_version["updated_at"][index]))
-        else
-          edited_events.push(*create_request_issue_decision_events(
-            change_data, last_version["updated_at"][index], status
-          ))
-        end
-      end
-      edited_events
-    end
-
-    def create_request_issue_decision_events(change_data, event_date, event)
-      events = []
-      event_user = change_data["decider"] || change_data["requestor"]
-
-      decision_event_hash = pending_system_hash
-        .merge("event_date" => event_date,
-               "event_user_name" => event_user,
-               "user_facility" => change_data["decider_station_id"] || change_data["requestor_station_id"],
-               "event_user_css_id" => change_data["decider_css_id"] || change_data["requestor_css_id"])
-
-      change_data = issue_attributes_for_request_type_addition(change_data) if change_data["request_type"] == "addition"
-
-      request_event_type = "request_#{event}"
-      events.push from_change_data(request_event_type.to_sym, change_data.merge(decision_event_hash))
-
-      events.push create_imr_in_progress_status_event(change_data)
-      events
-    end
-
-    def create_imr_in_progress_status_event(change_data)
-      in_progress_system_hash_events = pending_system_hash
-        .merge("event_date" => (change_data["decided_at"] ||
-          change_data["issue_modification_request_updated_at"]))
-
-      # If the imr is not decided, then always skip in progress creation
-      if imr_decided_or_cancelled?(change_data) && create_imr_in_progress_status_event?(change_data)
-        from_change_data(:in_progress, change_data.merge(in_progress_system_hash_events))
-      end
-    end
-
-    def create_imr_in_progress_status_event?(change_data)
-      # If the next imr is already decided in the same transaction, it's not in reverse order, and it's
-      # not the last imr then defer creation
-      return false if early_deferral?(change_data)
-
-      if do_not_defer_in_progress_creation?(change_data)
-        # If it's in reverse order and the creation of the next imr is after the current decision time then generate
-        # an event since the next imr will start a new pending/in progress loop
-        # Or
-        # If the next created by was after the decided_at then, this was an in progress transition so create one
-        # Or
-        # If it's the last IMR and the next imr was decided or cancelled in the same transaction then go ahead
-        # and generate an in progress event since the ordering is odd due to the decided at in the same transaction
-        true
-      elsif next_imr_decided_is_out_of_bounds?(change_data)
-        # If it's the end of the lead rows, then this is the last decided row
-        # If the next created at is in the same transaction, then defer event creation, otherwise create an in progress
-        # Or
-        # If the next imr was created at the same time that the current imr is decided, then defer
-        create_in_progress_event_for_last_decided_by_imr?(change_data)
-      elsif defer_in_progress_creation?(change_data)
-        # If the next imr was in the same transaction and it's also decided, then defer event creation to it.
-        # Or
-        # If the next imr was created in the same transaction as the next decided, then defer to the next imr
-        # Or
-        # If the next imr was created at the same time that the current imr is decided, then defer
-        # since it should never leave the current pending loop in that case
-        false
-      else
-        # If nothing else matches and the next one is also decided then go ahead and generate an in progress event
-        # This may occasionally result in a false positive but it should be right most of the time
-        change_data["next_decided_or_cancelled_at"].present?
-      end
-    end
-
-    def do_not_defer_in_progress_creation?(change_data)
-      (imr_reverse_order?(change_data) && next_imr_created_by_after_current_decided_at?(change_data)) ||
-        (change_data["next_decided_or_cancelled_at"].nil? &&
-           next_imr_created_by_after_current_decided_at?(change_data)) ||
-        (last_imr?(change_data) && next_imr_decided_or_cancelled_in_same_transaction?(change_data))
-    end
-
-    def defer_in_progress_creation?(change_data)
-      (next_imr_created_in_same_transaction?(change_data) && change_data["next_decided_or_cancelled_at"]) ||
-        next_imr_created_at_and_decided_at_in_same_transaction?(change_data) ||
-        next_imr_created_in_same_transaction_as_decided_at?(change_data)
-    end
-
-    def imr_decided_or_cancelled?(change_data)
-      %w[cancelled denied approved].include?(change_data["issue_modification_request_status"])
-    end
-
-    def next_imr_decided_or_cancelled_in_same_transaction?(change_data)
-      timestamp_within_seconds?(change_data["decided_at"], change_data["next_decided_or_cancelled_at"], 2)
-    end
-
-    def next_imr_created_in_same_transaction?(change_data)
-      timestamp_within_seconds?(change_data["issue_modification_request_created_at"],
-                                change_data["next_created_at"],
-                                2)
-    end
-
-    def next_imr_created_in_same_transaction_as_decided_at?(change_data)
-      timestamp_within_seconds?(change_data["next_created_at"],
-                                change_data["decided_at"],
-                                2)
-    end
-
-    def next_imr_created_by_after_current_decided_at?(change_data)
-      change_data["next_created_at"] &&
-        change_data["decided_at"] &&
-        !last_imr?(change_data) &&
-        (change_data["next_created_at"].change(usec: 0) > change_data["decided_at"].change(usec: 0))
-    end
-
-    def next_imr_created_at_and_decided_at_in_same_transaction?(change_data)
-      timestamp_within_seconds?(change_data["next_decided_or_cancelled_at"],
-                                change_data["next_created_at"],
-                                2)
-    end
-
-    def imr_reverse_order?(change_data)
-      change_data["previous_imr_decided_at"].nil? || change_data["decided_at"].nil? ||
-        (change_data["previous_imr_decided_at"] > change_data["decided_at"])
-    end
-
-    def next_imr_decided_is_out_of_bounds?(change_data)
-      change_data["next_decided_or_cancelled_at"] == OUT_OF_BOUNDS_LEAD_TIME
-    end
-
-    def last_imr?(change_data)
-      change_data["next_created_at"] == OUT_OF_BOUNDS_LEAD_TIME
-    end
-
-    def create_in_progress_event_for_last_decided_by_imr?(change_data)
-      if next_imr_created_in_same_transaction?(change_data) ||
-         next_imr_created_in_same_transaction_as_decided_at?(change_data)
-        false
-      else
-        true
-      end
-    end
-
-    def early_deferral?(change_data)
-      next_imr_decided_or_cancelled_in_same_transaction?(change_data) &&
-        !imr_reverse_order?(change_data) && !last_imr?(change_data)
-    end
-
-    def create_pending_status_event(change_data, event_date)
-      pending_system_hash_events = pending_system_hash
-        .merge("event_date" => event_date)
-
-      if change_data["previous_imr_created_at"].nil?
-        # If this is the first IMR then it will always generate a pending event.
-        from_change_data(:pending, change_data.merge(pending_system_hash_events))
-      elsif timestamp_within_seconds?(change_data["previous_imr_decided_at"],
-                                      change_data["issue_modification_request_created_at"],
-                                      STATUS_EVENT_TIME_WINDOW)
-        # If this IMR was created at the same time as the previous decided at then skip pending event creation.
-        nil
-      elsif !previous_imr_created_in_same_transaction?(change_data)
-        # if two imr's are of different transaction and if decision has already been made then we
-        # want to put pending status since it went back to pending status before it was approved/cancelled or denied.
-        from_change_data(:pending, change_data.merge(pending_system_hash_events))
-      end
-    end
-
     # rubocop:disable Metrics/MethodLength
     def create_status_events(change_data)
       status_events = []
-      versions = parse_versions(change_data["task_versions"])
+      versions = parse_versions(change_data)
+
       hookless_cancelled_events = handle_hookless_cancelled_status_events(versions, change_data)
       status_events.push(*hookless_cancelled_events)
 
@@ -365,35 +99,29 @@ def create_status_events(change_data)
         rest_of_versions.map do |version|
           status_events.push event_from_version(version, 1, change_data)
         end
-
-        # If there are no events, then it had versions but none that altered status so create one from current status
-        status_events.compact!
-        if status_events.empty?
-          status_events.push create_status_event_from_current_status(change_data)
-        end
       elsif hookless_cancelled_events.empty?
         # No versions so make an event with the current status
-        status_events.push create_status_event_from_current_status(change_data)
+        # There is a chance that a task has no intake either through data setup or through a remanded SC
+        event_date = change_data["intake_completed_at"] || change_data["task_created_at"]
+        status_events.push from_change_data(task_status_to_event_type(change_data["task_status"]),
+                                            change_data.merge("event_date" => event_date,
+                                                              "event_user_name" => "System"))
       end
 
       status_events
     end
     # rubocop:enable Metrics/MethodLength
 
-    def create_status_event_from_current_status(change_data)
-      # There is a chance that a task has no intake either through data setup or through a remanded SC
-      from_change_data(task_status_to_event_type(change_data["task_status"]),
-                       change_data.merge("event_date" => change_data["intake_completed_at"] ||
-                                                         change_data["task_created_at"],
-                                         "event_user_name" => "System"))
-    end
+    def parse_versions(change_data)
+      versions = change_data["task_versions"]
+      if versions
+        # Quite a bit faster but less safe. Should probably be fine since it's coming from the database
+        # rubocop:disable Security/YAMLLoad
+        versions[1..-2].split(",").map { |yaml| YAML.load(yaml.gsub(/^"|"$/, "")) }
+        # versions[1..-2].split(",").map { |yaml| YAML.safe_load(yaml.gsub(/^"|"$/, ""), [Time]) }
+        # rubocop:enable Security/YAMLLoad
 
-    def parse_versions(versions)
-      # Quite a bit faster but less safe. Should probably be fine since it's coming from the database
-      # rubocop:disable Security/YAMLLoad
-      # versions&.split("|||")&.map { |yaml| YAML.load(yaml.gsub(/^"|"$/, "")) }
-      versions&.split("|||")&.map { |yaml| YAML.load(yaml) }
-      # rubocop:enable Security/YAMLLoad
+      end
     end
 
     def create_issue_events(change_data)
@@ -416,32 +144,10 @@ def create_issue_events(change_data)
       issue_events
     end
 
-    def issue_attributes_for_request_type_addition(change_data)
-      # addition should not have issue_type that is pre-existing
-      issue_data = {
-        "nonrating_issue_category" => nil,
-        "nonrating_issue_description" => nil,
-        "decision_date" => nil
-      }
-
-      change_data.merge(issue_data)
-    end
-
-    def previous_imr_created_in_same_transaction?(change_data)
-      timestamp_within_seconds?(change_data["issue_modification_request_created_at"],
-                                change_data["previous_imr_created_at"] ||
-                                change_data["issue_modification_request_created_at"],
-                                ISSUE_MODIFICATION_REQUEST_CREATION_WINDOW)
-    end
-
     def extract_issue_ids_from_change_data(change_data, key)
       (change_data[key] || "").scan(/\d+/).map(&:to_i)
     end
 
-    def decider_user_facility(change_data)
-      change_data["decider_station_id"] || change_data["requestor_station_id"]
-    end
-
     def process_issue_ids(request_issue_ids, event_type, change_data)
       created_events = []
 
@@ -515,29 +221,10 @@ def task_status_to_event_type(task_status)
         "assigned" => :in_progress,
         "on_hold" => :incomplete,
         "completed" => :completed,
-        "cancelled" => :cancelled,
-        "pending" => :pending
+        "cancelled" => :cancelled
       }[task_status]
     end
 
-    def update_event_hash_data_from_version(version, index)
-      version_database_field_mapping.each_with_object({}) do |(version_key, db_key), data|
-        data[db_key] = version[version_key][index] unless version[version_key].nil?
-      end
-    end
-
-    def update_event_hash_data_from_version_object(version)
-      version_database_field_mapping.each_with_object({}) do |(version_key, db_key), data|
-        data[db_key] = version[version_key]
-      end
-    end
-
-    def create_event_from_version_object(version)
-      previous_version_database_field_mapping.each_with_object({}) do |(version_key, db_key), data|
-        data[db_key] = version[version_key]
-      end
-    end
-
     def event_from_version(changes, index, change_data)
       # If there is no task status change in the set of papertrail changes, ignore the object
       if changes["status"]
@@ -582,28 +269,6 @@ def update_event_hash(change_data)
       }
     end
 
-    def version_database_field_mapping
-      {
-        "nonrating_issue_category" => "requested_issue_type",
-        "nonrating_issue_description" => "requested_issue_description",
-        "remove_original_issue" => "remove_original_issue",
-        "request_reason" => "modification_request_reason",
-        "decision_date" => "requested_decision_date",
-        "decision_reason" => "decision_reason",
-        "withdrawal_date" => "issue_modification_request_withdrawal_date"
-      }
-    end
-
-    def previous_version_database_field_mapping
-      {
-        "nonrating_issue_category" => "previous_issue_type",
-        "nonrating_issue_description" => "previous_issue_description",
-        "decision_date" => "previous_decision_date",
-        "request_reason" => "previous_modification_request_reason",
-        "withdrawal_date" => "previous_withdrawal_date"
-      }
-    end
-
     def add_issue_update_event_hash(change_data)
       # Check the current request issue updates time to see if the issue update is in the correct row
       # If it is, then do the normal update_event_hash information
@@ -636,22 +301,6 @@ def retrieve_issue_update_data(change_data)
       end
     end
 
-    def request_issue_modification_event_hash(change_data)
-      {
-        "event_date" => change_data["issue_modification_request_created_at"],
-        "event_user_name" => change_data["requestor"],
-        "user_facility" => change_data["requestor_station_id"],
-        "event_user_css_id" => change_data["requestor_css_id"]
-      }
-    end
-
-    def pending_system_hash
-      {
-        "event_user_name" => "System",
-        "event_type" => "in_progress"
-      }
-    end
-
     def timestamp_within_seconds?(first_date, second_date, time_in_seconds)
       return false unless first_date && second_date
 
@@ -707,7 +356,7 @@ def to_csv_array
     [
       veteran_file_number, claimant_name, task_url, readable_task_status,
       days_waiting, readable_claim_type, readable_facility_name, readable_user_name, readable_event_date,
-      readable_event_type, issue_or_status_information, issue_modification_request_information, disposition_information
+      readable_event_type, issue_or_status_information, disposition_information
     ]
   end
 
@@ -722,16 +371,14 @@ def readable_task_status
       "in_progress" => "in progress",
       "on_hold" => "incomplete",
       "completed" => "completed",
-      "cancelled" => "cancelled",
-      "pending" => "pending"
+      "cancelled" => "cancelled"
     }[task_status]
   end
 
   def readable_claim_type
     {
       "HigherLevelReview" => "Higher-Level Review",
-      "SupplementalClaim" => "Supplemental Claim",
-      "Remand" => "Remand"
+      "SupplementalClaim" => "Supplemental Claim"
     }[claim_type]
   end
 
@@ -751,10 +398,6 @@ def readable_decision_date
     format_date_string(decision_date)
   end
 
-  def readable_new_decision_date
-    format_date_string(new_decision_date)
-  end
-
   def readable_disposition_date
     format_date_string(disposition_date)
   end
@@ -765,12 +408,10 @@ def readable_facility_name
     [Constants::BGS_FACILITY_CODES[user_facility], " (", user_facility, ")"].join
   end
 
-  # rubocop:disable Metrics/MethodLength
   def readable_event_type
     {
       in_progress: "Claim status - In progress",
       incomplete: "Claim status - Incomplete",
-      pending: "Claim status - Pending",
       completed: "Claim closed",
       claim_creation: "Claim created",
       completed_disposition: "Completed disposition",
@@ -779,18 +420,9 @@ def readable_event_type
       withdrew_issue: "Withdrew issue",
       removed_issue: "Removed issue",
       added_decision_date: "Added decision date",
-      cancelled: "Claim closed",
-      addition: "Requested issue addition",
-      removal: "Requested issue removal",
-      modification: "Requested issue modification",
-      withdrawal: "Requested issue withdrawal",
-      request_approved: "Approval of request - issue #{request_type}",
-      request_denied: "Rejection of request - issue #{request_type}",
-      request_cancelled: "Cancellation of request",
-      request_edited: "Edit of request - issue #{request_type}"
+      cancelled: "Claim closed"
     }[event_type]
   end
-  # rubocop:enable Metrics/MethodLength
 
   def issue_event?
     ISSUE_EVENTS.include?(event_type)
@@ -808,10 +440,6 @@ def status_event?
     STATUS_EVENTS.include?(event_type)
   end
 
-  def event_has_modification_request?
-    REQUEST_ISSUE_MODIFICATION_EVENTS.include?(event_type)
-  end
-
   private
 
   def set_attributes_from_change_history_data(new_event_type, change_data)
@@ -823,28 +451,23 @@ def set_attributes_from_change_history_data(new_event_type, change_data)
     parse_task_attributes(change_data)
     parse_issue_attributes(change_data)
     parse_disposition_attributes(change_data)
-    parse_request_issue_modification_attributes(change_data)
   end
 
   def parse_task_attributes(change_data)
     @task_id = change_data["task_id"]
-    @task_status = derive_task_status(change_data)
-    @claim_type = change_data["type_classifier"]
+    @task_status = change_data["task_status"]
+    @claim_type = change_data["appeal_type"]
     @assigned_at = change_data["assigned_at"]
     @days_waiting = change_data["days_waiting"]
   end
 
-  def derive_task_status(change_data)
-    change_data["is_assigned_present"] ? "pending" : change_data["task_status"]
-  end
-
   def parse_intake_attributes(change_data)
     @intake_completed_date = change_data["intake_completed_at"]
     @veteran_file_number = change_data["veteran_file_number"]
   end
 
   def parse_issue_attributes(change_data)
-    if issue_event? || event_has_modification_request?
+    if issue_event?
       @issue_type = change_data["nonrating_issue_category"]
       @issue_description = change_data["nonrating_issue_description"] || change_data["unidentified_issue_text"]
       @decision_date = change_data["decision_date"]
@@ -868,52 +491,6 @@ def parse_event_attributes(change_data)
     @event_user_css_id = change_data["event_user_css_id"]
   end
 
-  def parse_request_issue_modification_attributes(change_data)
-    if event_has_modification_request?
-      @request_type = change_data["request_type"]
-      @new_issue_type = change_data["requested_issue_type"]
-      @new_issue_description = change_data["requested_issue_description"]
-      @new_decision_date = change_data["requested_decision_date"]
-      @modification_request_reason = change_data["modification_request_reason"]
-      @decision_reason = change_data["decision_reason"]
-      @decided_at_date = change_data["decided_at"]
-      @issue_modification_request_withdrawal_date = change_data["issue_modification_request_withdrawal_date"]
-      @remove_original_issue = change_data["remove_original_issue"]
-      @issue_modification_request_status = change_data["issue_modification_request_status"]
-      @requestor = change_data["requestor"]
-      @decider = change_data["decider"]
-      parse_previous_issue_modification_attributes(change_data)
-    end
-  end
-
-  def parse_previous_issue_modification_attributes(change_data)
-    @previous_issue_type = derive_previous_issue_type(change_data)
-    @previous_decision_date = derive_previous_decision_date(change_data)
-    @previous_modification_request_reason = derive_previous_modification_request_reason(change_data)
-    @previous_issue_description = derive_previous_issue_description(change_data)
-    @previous_withdrawal_date = derive_previous_withdrawal_date(change_data)
-  end
-
-  def derive_previous_issue_type(change_data)
-    change_data["previous_issue_type"] || change_data["requested_issue_type"]
-  end
-
-  def derive_previous_decision_date(change_data)
-    change_data["previous_decision_date"] || change_data["requested_decision_date"]
-  end
-
-  def derive_previous_issue_description(change_data)
-    change_data["previous_issue_description"] || change_data["requested_issue_description"]
-  end
-
-  def derive_previous_modification_request_reason(change_data)
-    change_data["previous_modification_request_reason"] || change_data["modification_request_reason"]
-  end
-
-  def derive_previous_withdrawal_date(change_data)
-    change_data["previous_withdrawal_date"] || change_data["issue_modification_request_withdrawal_date"]
-  end
-
   ############ CSV and Serializer Helpers ############
 
   def abbreviated_user_name(name_string)
@@ -922,19 +499,11 @@ def abbreviated_user_name(name_string)
   end
 
   def issue_information
-    if issue_event? || event_has_modification_request?
+    if issue_event?
       [issue_type, issue_description, readable_decision_date]
     end
   end
 
-  def issue_modification_request_information
-    if event_has_modification_request?
-      [new_issue_type, new_issue_description, readable_new_decision_date, modification_request_reason, decision_reason]
-    else
-      [nil, nil, nil, nil, nil]
-    end
-  end
-
   def disposition_information
     if disposition_event?
       [disposition, decision_description, readable_disposition_date]
@@ -955,8 +524,7 @@ def status_description
       incomplete: "Claim cannot be processed until decision date is entered.",
       completed: "Claim closed.",
       claim_creation: "Claim created.",
-      cancelled: "Claim cancelled.",
-      pending: "Claim cannot be processed until VHA admin reviews pending requests."
+      cancelled: "Claim closed."
     }[event_type]
   end
 
diff --git a/app/services/claim_change_history/claim_history_service.rb b/app/services/claim_change_history/claim_history_service.rb
index 5ed8065f002..c778ae4f01b 100644
--- a/app/services/claim_change_history/claim_history_service.rb
+++ b/app/services/claim_change_history/claim_history_service.rb
@@ -4,9 +4,7 @@
 class ClaimHistoryService
   attr_reader :business_line, :processed_task_ids,
               :processed_request_issue_ids, :processed_request_issue_update_ids,
-              :processed_decision_issue_ids, :processed_issue_modification_request_ids,
-              :processed_issue_modification_task_ids,
-              :events, :filters
+              :processed_decision_issue_ids, :events, :filters
   attr_writer :filters
 
   TIMING_RANGES = %w[
@@ -25,23 +23,23 @@ def initialize(business_line = VhaBusinessLine.singleton, filters = {})
     @processed_request_issue_update_ids = Set.new
     @processed_decision_issue_ids = Set.new
     @processed_request_issue_ids = Set.new
-    @processed_issue_modification_request_ids = Set.new
-    @processed_issue_modification_task_ids = Set.new
     @events = []
   end
 
   def build_events
     # Reset the instance attributes from the last time build_events was ran
     reset_processing_attributes
+
     all_data = business_line.change_history_rows(@filters)
+
     all_data.entries.each do |change_data|
       process_request_issue_update_events(change_data)
       process_request_issue_events(change_data)
       process_decision_issue_and_task_events(change_data)
-      process_request_issue_modification_events(change_data)
       # Don't process task events outside of decision issues unless there are no decision issues
       process_task_events(change_data) unless change_data["task_status"] == "completed"
     end
+
     # Compact and sort in place to reduce garbage collection
     @events.compact!
     @events.sort_by! do |event|
@@ -66,8 +64,6 @@ def reset_processing_attributes
     @processed_request_issue_update_ids.clear
     @processed_decision_issue_ids.clear
     @processed_request_issue_ids.clear
-    @processed_issue_modification_request_ids.clear
-    @processed_issue_modification_task_ids.clear
     @events.clear
   end
 
@@ -102,9 +98,7 @@ def matches_filter(new_events)
   def process_event_filter(new_events)
     return new_events if @filters[:events].blank?
 
-    new_events.select do |event|
-      event && ensure_array(@filters[:events]).include?(event.event_type)
-    end
+    new_events.select { |event| event && ensure_array(@filters[:events]).include?(event.event_type) }
   end
 
   def process_issue_type_filter(new_events)
@@ -211,6 +205,7 @@ def process_request_issue_update_events(change_data)
 
   def process_task_events(change_data)
     task_id = change_data["task_id"]
+
     if task_id && !@processed_task_ids.include?(task_id)
       @processed_task_ids.add(task_id)
       save_events(ClaimHistoryEvent.create_claim_creation_event(change_data))
@@ -240,39 +235,6 @@ def process_decision_issue_and_task_events(change_data)
     end
   end
 
-  def process_request_issue_modification_events(change_data)
-    issue_modification_request_id = change_data["issue_modification_request_id"]
-
-    return unless issue_modification_request_id
-
-    is_processed = @processed_issue_modification_request_ids.include?(issue_modification_request_id)
-
-    if issue_modification_request_id && !is_processed
-      @processed_issue_modification_request_ids.add(issue_modification_request_id)
-      save_events(ClaimHistoryEvent.create_issue_modification_request_event(change_data))
-      save_events(ClaimHistoryEvent.create_edited_request_issue_events(change_data))
-    end
-    # if imr version doesn't have status it means, imr has been made but no action yet taken from admin
-    process_pending_status_event(change_data) if !is_processed
-  end
-
-  def process_pending_status_event(change_data)
-    task_id = change_data["task_id"]
-
-    # processed_issue_modification_task_id stores all the task id that has already
-    # been processed so that it prevents the duplicate entry of pending event based on change_data.
-    if task_id &&
-       !@processed_issue_modification_task_ids.include?(task_id) &&
-       change_data["issue_modification_request_status"] == "assigned"
-      @processed_issue_modification_task_ids.add(task_id)
-
-      save_events(
-        ClaimHistoryEvent.create_pending_status_event(change_data,
-                                                      change_data["issue_modification_request_created_at"])
-      )
-    end
-  end
-
   def ensure_array(variable)
     variable.is_a?(Array) ? variable : [variable]
   end
diff --git a/app/services/hearing_schedule/generate_hearing_days_schedule.rb b/app/services/hearing_schedule/generate_hearing_days_schedule.rb
index f236cf05998..f796fa05ef8 100644
--- a/app/services/hearing_schedule/generate_hearing_days_schedule.rb
+++ b/app/services/hearing_schedule/generate_hearing_days_schedule.rb
@@ -5,7 +5,7 @@
 # video hearings and CO hearings in a specified date range after filtering out weekends,
 # holidays, and board non-availability dates. Full details of the algorithm can be
 # found `HearingSchedule.md` in Appeals-team repo (link: https://github.com/department-of-veterans-affairs/appeals-team/
-# blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingSchedule.md).
+# blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingSchedule.md).
 # WIKI : https://github.com/department-of-veterans-affairs/caseflow/wiki/Caseflow-Hearings#build-hearing-schedule
 ##
 class HearingSchedule::GenerateHearingDaysSchedule
diff --git a/app/views/supplemental_claims/edit.html.erb b/app/views/supplemental_claims/edit.html.erb
index 3c0200e7e13..5419b2d10ab 100644
--- a/app/views/supplemental_claims/edit.html.erb
+++ b/app/views/supplemental_claims/edit.html.erb
@@ -7,7 +7,6 @@
     userCanEditIntakeIssues: current_user.can_edit_intake_issues?,
     userCanRequestIssueUpdates: current_user.can_request_for_issue_updates?,
     userIsVhaAdmin: current_user.vha_business_line_admin_user?,
-    isRemand: supplemental_claim.is_a?(Remand),
     dropdownUrls: dropdown_urls,
     applicationUrls: application_urls,
     feedbackUrl: feedback_url,
diff --git a/client/COPY.json b/client/COPY.json
index 05191f7d8b0..bbc5dc80ad9 100644
--- a/client/COPY.json
+++ b/client/COPY.json
@@ -1,3 +1,4 @@
+
 {
   "CASE_SEARCH_HOME_PAGE_HEADING": "Veteran Case Search",
   "CASE_SEARCH_INPUT_PLACEHOLDER": "Enter a file number, SSN, or AMA docket number",
@@ -1515,6 +1516,5 @@
     }
   },
   "VHA_BANNER_DISPOSITIONS_CANNOT_BE_UPDATED_NON_ADMIN": "Requests for issue modifications have been submitted for this case. Dispositions cannot be made until a VHA admin completes review of the requested changes.",
-  "VHA_BANNER_DISPOSITIONS_CANNOT_BE_UPDATED_ADMIN": "Requests for issue modifications have been submitted for this case. Dispositions cannot be made until a VHA admin completes review of the requested changes. Click the \"Edit issues\" button above to review the issue modification requests.",
-  "REMANDS_NOT_EDITABLE": "Remands can not be edited."
+  "VHA_BANNER_DISPOSITIONS_CANNOT_BE_UPDATED_ADMIN": "Requests for issue modifications have been submitted for this case. Dispositions cannot be made until a VHA admin completes review of the requested changes. Click the \"Edit issues\" button above to review the issue modification requests."
 }
diff --git a/client/app/components/Alert.jsx b/client/app/components/Alert.jsx
index f2fdbf8618a..0fcc4da8983 100644
--- a/client/app/components/Alert.jsx
+++ b/client/app/components/Alert.jsx
@@ -21,14 +21,11 @@ export default class Alert extends React.Component {
 
     const typeClass = `usa-alert-${type}`;
 
-    const className = classnames('usa-alert',
-      typeClass,
-      {
-        'usa-alert-slim': !title,
-        fixed,
-        'cf-margin-bottom-2rem': lowerMargin,
-      },
-    );
+    const className = classnames('usa-alert', typeClass, {
+      'usa-alert-slim': !title,
+      fixed,
+      'cf-margin-bottom-2rem': lowerMargin,
+    });
 
     return (
       <div role="alert" className={className} {...styling}>
diff --git a/client/app/components/AppFrame.jsx b/client/app/components/AppFrame.jsx
index 62b093ea4ff..c2b45d9f9af 100644
--- a/client/app/components/AppFrame.jsx
+++ b/client/app/components/AppFrame.jsx
@@ -1,38 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Route } from 'react-router-dom';
 import getAppWidthStyling from
   '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/util/getAppWidthStyling';
-import classnames from 'classnames';
-
-import Alert from './Alert';
-
-// eslint-disable-next-line no-process-env
-const env = process.env.DEPLOY_ENV;
-
-const className = classnames(
-  {
-    'no-env-alert': env !== 'prodtest' && env !== 'preprod' && env !== 'uat' && env !== 'demo',
-    'preprod-env-alert': env !== 'prod' && env === 'preprod',
-    'prodtest-env-alert': env !== 'prod' && env === 'prodtest',
-    'uat-env-alert': env !== 'prod' && env === 'uat',
-    'demo-env-alert': env !== 'prod' && env === 'demo',
-  },
-);
 
 const AppFrame = ({ children, wideApp }) =>
   <main {...getAppWidthStyling(wideApp)} role="main" id="Main">
-    <Route
-      exact
-      path="/"
-      title="Caseflow | Home"
-      component={() =>
-      // eslint-disable-next-line no-undefined
-        (env !== 'prod' && env !== 'production' && env !== undefined) &&
-      (<div className={className}>
-        <Alert type="warning">This is the {env} environment!</Alert>
-      </div>)
-      } />
     {children}
   </main>;
 
diff --git a/client/app/components/SearchBar.stories.mdx b/client/app/components/SearchBar.stories.mdx
index 642b75ac6cf..ec6b174bda9 100644
--- a/client/app/components/SearchBar.stories.mdx
+++ b/client/app/components/SearchBar.stories.mdx
@@ -56,7 +56,7 @@ Labels can be set with the `title` property.
 ## Internal Text
 
 Text can be set and shown inside of the search bar with the `internalText` property. This can be used to show extra
-information about the search. Check out [`DocumentSearch#getInternalText`](https://github.com/department-of-veterans-affairs/caseflow/blob/main/client%2Fapp%2Freader%2FDocumentSearch.jsx#L118)
+information about the search. Check out [`DocumentSearch#getInternalText`](https://github.com/department-of-veterans-affairs/caseflow/blob/master/client%2Fapp%2Freader%2FDocumentSearch.jsx#L118)
 to see how we change this field dynamically as the user types to display the number of results.
 
 <Story story={SearchBarStories.Internal} />
@@ -82,4 +82,4 @@ disabled and shows a loading icon while waiting for results.
 
 ## Args
 
-<ArgsTable of={SearchBar} />
+<ArgsTable of={SearchBar} />
\ No newline at end of file
diff --git a/client/app/components/StyleGuideComponentTitle.jsx b/client/app/components/StyleGuideComponentTitle.jsx
index f286906d9cd..ba86ade3691 100644
--- a/client/app/components/StyleGuideComponentTitle.jsx
+++ b/client/app/components/StyleGuideComponentTitle.jsx
@@ -20,7 +20,7 @@ export default class StyleGuideComponentTitle extends React.PureComponent {
         // isExternalLink is for any code sample that's outside the StyleGuide container directory
         baseUrl = 'https://github.com/department-of-veterans-affairs/caseflow';
       } else {
-        baseUrl = 'https://github.com/department-of-veterans-affairs/caseflow/blob/main/client/app/containers/StyleGuide/';
+        baseUrl = 'https://github.com/department-of-veterans-affairs/caseflow/blob/master/client/app/containers/StyleGuide/';
       }
       /* eslint-enable max-len */
 
diff --git a/client/app/components/TableFilter.jsx b/client/app/components/TableFilter.jsx
index 248903e4fb4..bccd70ce974 100644
--- a/client/app/components/TableFilter.jsx
+++ b/client/app/components/TableFilter.jsx
@@ -75,11 +75,7 @@ class TableFilter extends React.PureComponent {
       });
 
       // Case insensitive ordering for the filter options
-      return _.orderBy(
-        filterOptionsFromApi.filter((option) => option.displayText),
-        [(option) => option.displayText.toLowerCase()],
-        ['asc']
-      );
+      return _.orderBy(filterOptionsFromApi, [(option) => option.displayText.toLowerCase()], ['asc']);
     }
 
     const columnValues = tableDataByRow.map((obj) => {
diff --git a/client/app/containers/StyleGuide/StyleGuideDashboard.jsx b/client/app/containers/StyleGuide/StyleGuideDashboard.jsx
index 13c7448983c..547406d7f57 100644
--- a/client/app/containers/StyleGuide/StyleGuideDashboard.jsx
+++ b/client/app/containers/StyleGuide/StyleGuideDashboard.jsx
@@ -8,7 +8,7 @@ export default class StyleGuideDashboard extends React.PureComponent {
       <StyleGuideComponentTitle
         title="Dashboard"
         id="dashboard"
-        link="-efolder/blob/main/app/views/stats/show.html.erb"
+        link="-efolder/blob/master/app/views/stats/show.html.erb"
         isExternalLink
       />
       <p>
diff --git a/client/app/intake/pages/addIssues/addIssues.jsx b/client/app/intake/pages/addIssues/addIssues.jsx
index 1b567e54753..d887038ef76 100644
--- a/client/app/intake/pages/addIssues/addIssues.jsx
+++ b/client/app/intake/pages/addIssues/addIssues.jsx
@@ -330,7 +330,6 @@ class AddIssuesPage extends React.Component {
       userIsVhaAdmin,
       userCanSplitAppeal,
       userCanRequestIssueUpdates,
-      isRemand,
       isLegacy,
       pendingIssueModificationRequests,
       intakeFromVbms
@@ -427,7 +426,6 @@ class AddIssuesPage extends React.Component {
     const showRequestIssueUpdateOptions = editPage &&
       userCanRequestIssueUpdates &&
       !originalIssuesHaveNoDecisionDate() &&
-      !isRemand &&
       intakeData.benefitType === 'vha';
 
     const disableIssueActions = editPage &&
@@ -870,8 +868,6 @@ class AddIssuesPage extends React.Component {
 
         {editPage && this.establishmentCredits()}
 
-        {editPage && isRemand ? <Alert type="info" message={COPY.REMANDS_NOT_EDITABLE} /> : null}
-
         <Table columns={columns} rowObjects={rowObjects} rowClassNames={additionalRowClasses} slowReRendersAreOk />
 
         {!_.isEmpty(issuesPendingWithdrawal) && (
@@ -975,7 +971,6 @@ export const EditAddIssuesPage = connect(
     userIsVhaAdmin: state.userIsVhaAdmin,
     userCanSplitAppeal: state.userCanSplitAppeal,
     userCanRequestIssueUpdates: state.userCanRequestIssueUpdates,
-    isRemand: state.isRemand,
     isLegacy: state.isLegacy,
     intakeFromVbms: state.intakeFromVbms
   }),
diff --git a/client/app/intakeEdit/components/EditButtons.jsx b/client/app/intakeEdit/components/EditButtons.jsx
index f97d0c5cac6..a624f79f56b 100644
--- a/client/app/intakeEdit/components/EditButtons.jsx
+++ b/client/app/intakeEdit/components/EditButtons.jsx
@@ -164,7 +164,6 @@ class SaveButtonUnconnected extends React.Component {
       benefitType,
       pendingIssueModificationRequests,
       originalPendingIssueModificationRequests,
-      isRemand,
       openIssueModificationRequests
     } = this.props;
 
@@ -191,7 +190,7 @@ class SaveButtonUnconnected extends React.Component {
     const saveDisabled = (_.isEqual(addedIssues, originalIssues) &&
        _.isEqual(pendingIssueModificationRequests, originalPendingIssueModificationRequests)) ||
       invalidVeteran ||
-      !withdrawDateValid || hasPendingAdditionRequests || isRemand;
+      !withdrawDateValid || hasPendingAdditionRequests;
 
     let saveButtonText;
 
@@ -302,7 +301,6 @@ SaveButtonUnconnected.propTypes = {
   specialtyCaseTeamDistribution: PropTypes.bool,
   pendingIssueModificationRequests: PropTypes.array,
   originalPendingIssueModificationRequests: PropTypes.array,
-  isRemand: PropTypes.bool,
   openIssueModificationRequests: PropTypes.array,
   state: PropTypes.shape({
     addedIssues: PropTypes.array
@@ -327,7 +325,6 @@ const SaveButton = connect(
     specialtyCaseTeamDistribution: state.featureToggles.specialtyCaseTeamDistribution,
     pendingIssueModificationRequests: state.pendingIssueModificationRequests,
     openIssueModificationRequests: getOpenPendingIssueModificationRequests(state),
-    isRemand: state.isRemand,
     originalPendingIssueModificationRequests: state.originalPendingIssueModificationRequests,
     state
   }),
diff --git a/client/app/intakeEdit/reducers/index.js b/client/app/intakeEdit/reducers/index.js
index 4580d78ffbc..fbcb6a7c6c1 100644
--- a/client/app/intakeEdit/reducers/index.js
+++ b/client/app/intakeEdit/reducers/index.js
@@ -17,7 +17,6 @@ export const mapDataToInitialState = function(props = {}) {
     userIsVhaAdmin,
     userCanSplitAppeal,
     userCanRequestIssueUpdates,
-    isRemand,
     userFullName,
     userCssId,
     isLegacy,
@@ -49,7 +48,6 @@ export const mapDataToInitialState = function(props = {}) {
     userIsVhaAdmin,
     userCanSplitAppeal,
     userCanRequestIssueUpdates,
-    isRemand,
     userCssId,
     userFullName,
     isLegacy,
diff --git a/client/app/nonComp/components/Disposition.jsx b/client/app/nonComp/components/Disposition.jsx
index 6ad77dbdbd9..4bb4e015ff2 100644
--- a/client/app/nonComp/components/Disposition.jsx
+++ b/client/app/nonComp/components/Disposition.jsx
@@ -177,8 +177,6 @@ class NonCompDispositions extends React.PureComponent {
     }
 
     let editIssuesLink = null;
-    const editIssuesDisabled = task.type === 'Remand';
-    const editIssuesButtonType = editIssuesDisabled ? 'disabled' : 'secondary';
     const displayPOAComponent = task.business_line === 'vha';
     const displayRequestIssueModification = (!displayPOAComponent || isBusinessLineAdmin);
 
@@ -196,17 +194,9 @@ class NonCompDispositions extends React.PureComponent {
       </React.Fragment>;
 
       editIssuesLink = (displayRequestIssueModification) ? <React.Fragment>
-        <Link
-          button={editIssuesButtonType}
-          href={appeal.editIssuesUrl}>
-          Edit Issues
-        </Link>
+        <Link button="secondary" href={appeal.editIssuesUrl}>Edit Issues</Link>
       </React.Fragment> : <React.Fragment>
-        <Link
-          button={editIssuesButtonType}
-          href={appeal.editIssuesUrl}>
-          Request issue modification
-        </Link>
+        <Link button="secondary" href={appeal.editIssuesUrl}>Request issue modification</Link>
         <Button disabled>Edit Issues</Button>
       </React.Fragment>;
     }
@@ -247,11 +237,6 @@ class NonCompDispositions extends React.PureComponent {
             {isBusinessLineAdmin && decisionHasPendingRequestIssues ? null :
               <div className="usa-width-one-whole" style={{ paddingBottom: '30px' }} >{decisionHeaderText}</div>
             }
-            {editIssuesDisabled ?
-              <div className="usa-width-one-whole">
-
-                <Alert type="info" messageStyling={messageStyling} message={COPY.REMANDS_NOT_EDITABLE} />
-              </div> : null}
             {decisionHasPendingRequestIssues ?
               <div className="usa-width-one-whole">
                 <Alert type="info" messageStyling={messageStyling} message={bannerDecisionBannerText} />
diff --git a/client/app/nonComp/components/IndividualClaimHistoryTable.jsx b/client/app/nonComp/components/IndividualClaimHistoryTable.jsx
index 78b766a8e4d..a42bb20078b 100644
--- a/client/app/nonComp/components/IndividualClaimHistoryTable.jsx
+++ b/client/app/nonComp/components/IndividualClaimHistoryTable.jsx
@@ -1,12 +1,8 @@
-/* eslint-disable max-lines */
-import React, { useState } from 'react';
+import React from 'react';
 import QueueTable from '../../queue/QueueTable';
 import BENEFIT_TYPES from 'constants/BENEFIT_TYPES';
 import { formatDateStr } from 'app/util/DateUtil';
 import PropTypes from 'prop-types';
-import StringUtil from 'app/util/StringUtil';
-
-const { capitalizeFirst } = StringUtil;
 
 const IndividualClaimHistoryTable = (props) => {
 
@@ -38,153 +34,25 @@ const IndividualClaimHistoryTable = (props) => {
     return <React.Fragment>Claim can be processed.</React.Fragment>;
   };
 
-  const ClaimPendingFragment = () => {
-    return <React.Fragment>Claim cannot be processed until VHA admin reviews pending requests.</React.Fragment>;
-  };
-
   const ClaimIncompleteFragment = () => {
     return <React.Fragment>Claim cannot be processed until decision date is entered.</React.Fragment>;
   };
 
-  const benefitType = (details) => {
-    return <>
-      <b>Benefit type: </b>{BENEFIT_TYPES[details.benefitType]}<br />
-    </>;
-  };
-
   const ClaimClosedFragment = (details) => {
-    const fragment = details.eventType === 'cancelled' ? <>
-      Claim cancelled.
-    </> : <>
-        Claim closed.<br />
+    return <React.Fragment>
+      Claim closed.<br />
       <b>Claim decision date: </b>{formatDecisionDate(details.dispositionDate)}
-    </>;
-
-    return (
-      <div>
-        {fragment}
-      </div>
-    );
+    </React.Fragment>;
   };
 
   const AddedIssueFragment = (details) => {
     return <React.Fragment>
-      { benefitType(details) }
+      <b>Benefit type: </b>{BENEFIT_TYPES[details.benefitType]}<br />
       <b>Issue type: </b>{details.issueType}<br />
       <b>Issue description: </b>{details.issueDescription}<br />
     </React.Fragment>;
   };
 
-  const RequestedIssueFragment = (details) => {
-    return <React.Fragment>
-      { benefitType(details) }
-      <b>Issue type: </b>{details.newIssueType}<br />
-      <b>Issue description: </b>{details.newIssueDescription}<br />
-      <b>Decision date: </b>{formatDecisionDate(details.newDecisionDate)}<br />
-      <b>{capitalizeFirst(details.requestType)} request reason: </b>{details.modificationRequestReason}<br />
-    </React.Fragment>;
-  };
-
-  const WithdrawalRequestedIssueFragment = (details) => {
-    return <>
-      <RequestedIssueFragment {...details} />
-      <b>Withdrawal request date: </b>{formatDecisionDate(details.issueModificationRequestWithdrawalDate)}<br />
-    </>;
-  };
-
-  const formatLabel = (baseLabel, prefix) => {
-    if (prefix) {
-      return `${prefix} ${baseLabel.toLowerCase()}`;
-    }
-
-    return baseLabel;
-  };
-
-  const previousModificationFragment = (details, prefix) => {
-    return <React.Fragment>
-      <b>{formatLabel('Issue type:', prefix)} </b>{details.previousIssueType}<br />
-      <b>{formatLabel('Issue description:', prefix)} </b>{details.previousIssueDescription}<br />
-      <b>{formatLabel('Decision date:', prefix)} </b>{formatDecisionDate(details.previousDecisionDate)}<br />
-      <b>{capitalizeFirst(details.requestType)} request reason: </b>{details.previousModificationRequestReason}<br />
-    </React.Fragment>;
-  };
-
-  const RequestedIssueModificationFragment = (details) => {
-    return <React.Fragment>
-      { benefitType(details) }
-      <b>Current issue type: </b>{details.issueType}<br />
-      <b>Current issue description: </b>{details.issueDescription}<br />
-      <b>Current decision date: </b>{formatDecisionDate(details.decisionDate)}<br />
-      { previousModificationFragment(details, 'New') }
-    </React.Fragment>;
-  };
-
-  const RemoveOriginalIssueFragment = (details) => {
-    return <React.Fragment>
-      <b>Remove original issue: </b>{details.removeOriginalIssue ? 'Yes' : 'No' }<br />
-    </React.Fragment>;
-  };
-
-  const requestDecision = (details) => {
-    return <React.Fragment>
-      <b>Request decision: </b> {details.issueModificationRequestStatus === 'denied' ? 'Rejected' : 'Approved'} <br />
-    </React.Fragment>;
-  };
-
-  const RequestedIssueDecisionFragment = (details) => {
-    return <React.Fragment>
-      {requestDecision(details)}
-      { details.issueModificationRequestStatus === 'approved' && details.requestType === 'modification' ?
-        <RemoveOriginalIssueFragment {...details} /> : null
-      }
-      { details.issueModificationRequestStatus === 'denied' ?
-        <React.Fragment>
-          <b>Reason for rejection: </b> {details.decisionReason} <br />
-        </React.Fragment> : null
-      }
-      <b>Request originated by: </b>{details.requestor}<br />
-    </React.Fragment>;
-  };
-
-  const modificationRequestReason = (details) => {
-    return <React.Fragment>
-      <b>New {details.requestType} request reason: </b>{details.modificationRequestReason}<br />
-    </React.Fragment>;
-  };
-
-  const EditOfRequestIssueModification = (details) => {
-    let component = null;
-
-    switch (details.requestType) {
-    case 'modification':
-    case 'addition':
-      component = <React.Fragment>
-        <b>New issue type: </b>{details.newIssueType}<br />
-        <b>New issue description: </b>{details.newIssueDescription}<br />
-        <b>New decision date: </b>{formatDecisionDate(details.newDecisionDate)}<br />
-        {modificationRequestReason(details)}
-      </React.Fragment>;
-      break;
-    case 'removal':
-      component = <React.Fragment>
-        {modificationRequestReason(details)}
-      </React.Fragment>;
-      break;
-    case 'withdrawal':
-      component = <React.Fragment>
-        {modificationRequestReason(details)}
-        <b>New withdrawal request date: </b> {formatDecisionDate(details.issueModificationRequestWithdrawalDate)}<br />
-      </React.Fragment>;
-      break;
-    default:
-      return null;
-    }
-
-    return <React.Fragment>
-      {component}
-    </React.Fragment>;
-  };
-
   const AddedIssueWithDateFragment = (details) => {
     return <React.Fragment>
       <AddedIssueFragment {...details} />
@@ -225,74 +93,12 @@ const IndividualClaimHistoryTable = (props) => {
     </React.Fragment>;
   };
 
-  const WithdrawnRequestedIssueModificationFragment = (details) => {
-    return <React.Fragment>
-      <PreviousFragmentWithBenefitType {...details} />
-      <b>Withdrawal request date: </b> {formatDecisionDate(details.previousWithdrawalDate)}<br />
-    </React.Fragment>;
-  };
-
-  const PreviousFragmentWithBenefitType = (details) => {
-    return <React.Fragment>
-      { benefitType(details) }
-      { previousModificationFragment(details) }
-    </React.Fragment>;
-  };
-
-  const OriginalRequestedIssueModificationFragment = (details) => {
+  const DetailsFragment = (row) => {
     let component = null;
 
-    switch (details.requestType) {
-    case 'modification':
-      component = <RequestedIssueModificationFragment {...details} />;
-      break;
-    case 'addition':
-    case 'removal':
-      component = <PreviousFragmentWithBenefitType {...details} />;
-      break;
-    case 'withdrawal':
-      component = <WithdrawnRequestedIssueModificationFragment {...details} />;
-      break;
-    default:
-      return null;
-    }
-
-    return (
-      <div>
-        {component}
-      </div>
-    );
-  };
-
-  const OriginalDetailsFragments = (row) => {
-    const { details, modificationRequestDetails } = row;
-    const requestModificationDetails = { ...details, ...modificationRequestDetails };
+    const { readableEventType, details } = row;
 
-    const [isOpen, setIsOpen] = useState(false);
-
-    const toggle = () => {
-      setIsOpen(!isOpen);
-    };
-
-    return (
-      <div>
-        <div style={{ marginBottom: '15px' }}>
-          <a onClick={toggle} style={{ cursor: 'pointer' }}>{`${isOpen ? 'Hide' : 'View' } original request`}</a>
-        </div>
-        {isOpen &&
-          <div>
-            <OriginalRequestedIssueModificationFragment {...requestModificationDetails} />
-          </div>}
-      </div>
-    );
-  };
-
-  const DetailsFragment = (row) => {
-
-    let component = null;
-    const { readableEventType, details, modificationRequestDetails } = row;
-    const detailsExtended = { ...details, eventDate: row.eventDate, eventType: row.eventType };
-    const requestIssueModificationDetails = { ...modificationRequestDetails, ...detailsExtended };
+    const detailsExtended = { ...details, eventDate: row.eventDate };
 
     switch (readableEventType) {
     case 'Claim created':
@@ -304,9 +110,6 @@ const IndividualClaimHistoryTable = (props) => {
     case 'Completed disposition':
       component = <CompletedDispositionFragment {...detailsExtended} />;
       break;
-    case 'Claim status - Pending':
-      component = <ClaimPendingFragment />;
-      break;
     case 'Claim status - In progress':
       component = <ClaimInProgressFragment />;
       break;
@@ -328,42 +131,13 @@ const IndividualClaimHistoryTable = (props) => {
     case 'Removed issue':
       component = <RemovedIssueFragment {...detailsExtended} />;
       break;
-    case 'Cancellation of request':
-      component = <OriginalRequestedIssueModificationFragment {...requestIssueModificationDetails} />;
-      break;
-    case 'Requested issue modification':
-      component = <RequestedIssueModificationFragment {...requestIssueModificationDetails} />;
-      break;
-    case 'Requested issue addition':
-    case 'Requested issue removal':
-      component = <RequestedIssueFragment {...requestIssueModificationDetails} />;
-      break;
-    case 'Requested issue withdrawal':
-      component = <WithdrawalRequestedIssueFragment {...requestIssueModificationDetails} />;
-      break;
-    case `Edit of request - issue ${requestIssueModificationDetails.requestType}`:
-      component = <EditOfRequestIssueModification {...requestIssueModificationDetails} />;
-      break;
-    case `Rejection of request - issue ${requestIssueModificationDetails.requestType}`:
-    case `Approval of request - issue ${requestIssueModificationDetails.requestType}`:
-      component = <RequestedIssueDecisionFragment {...requestIssueModificationDetails} />;
-      break;
     default:
       return null;
     }
 
-    const chunk = [
-      'request_approved',
-      'request_edited',
-      'request_denied'
-    ];
-
-    return (
-      <div>
-        <p>{component}</p>
-        { chunk.includes(requestIssueModificationDetails.eventType) ? <OriginalDetailsFragments {...row} /> : null }
-      </div>
-    );
+    return <p>
+      {component}
+    </p>;
   };
 
   const dateSort = (row) => {
@@ -436,4 +210,3 @@ IndividualClaimHistoryTable.propTypes = {
 };
 
 export default IndividualClaimHistoryTable;
-/* eslint-enable max-lines */
diff --git a/client/app/nonComp/components/ReportPage/Conditions/DecisionReviewType.jsx b/client/app/nonComp/components/ReportPage/Conditions/DecisionReviewType.jsx
index 85ba8461da3..0cf4879d68c 100644
--- a/client/app/nonComp/components/ReportPage/Conditions/DecisionReviewType.jsx
+++ b/client/app/nonComp/components/ReportPage/Conditions/DecisionReviewType.jsx
@@ -1,58 +1,69 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Controller, useFormContext } from 'react-hook-form';
+import { useFormContext } from 'react-hook-form';
+import Checkbox from 'app/components/Checkbox';
 import * as yup from 'yup';
 import { get } from 'lodash';
-import SearchableDropdown from 'app/components/SearchableDropdown';
 import { AT_LEAST_ONE_OPTION } from 'constants/REPORT_PAGE_VALIDATION_ERRORS';
 
-const DROPDOWN_OPTIONS = [
+const CHECKBOX_OPTIONS = [
   {
     label: 'Higher-Level Reviews',
-    value: 'HigherLevelReview'
+    name: 'HigherLevelReview'
   },
   {
     label: 'Supplemental Claims',
-    value: 'SupplementalClaim'
-  },
-  {
-    label: 'Remands',
-    value: 'Remand'
+    name: 'SupplementalClaim'
   }
 ];
 
 export const decisionReviewTypeSchema = yup.object({
-  decisionReviewTypes: yup.array().min(1, AT_LEAST_ONE_OPTION)
+  HigherLevelReview: yup.boolean(),
+  SupplementalClaim: yup.boolean(),
+}).test('at-least-one-true', AT_LEAST_ONE_OPTION, (obj) => {
+  const atLeastOneTrue = Object.values(obj).some((value) => value === true);
+
+  if (!atLeastOneTrue) {
+    return false;
+  }
+
+  return true;
 });
 
-export const DecisionReviewType = ({ control, field, name }) => {
+export const DecisionReviewType = ({ field, name, register }) => {
   const { errors } = useFormContext();
-  const nameDecisionReviewTypes = `${name}.options.decisionReviewTypes`;
+  const hasFormErrors = get(errors, name);
+
+  const classNames = hasFormErrors ?
+    'decisionReviewTypeContainer decisionReviewTypeContainerError' :
+    'decisionReviewTypeContainer';
+
+  const errorMessage = get(errors, name)?.options?.message;
 
   return (
-    <div className="report-page-multi-select-dropdown decision-review-types">
-      <Controller
-        control={control}
-        name={nameDecisionReviewTypes}
-        defaultValue={field.options.decisionReviewTypes ?? []}
-        render={({ onChange, ref, ...rest }) => (
-          <SearchableDropdown
-            {...rest}
-            errorMessage={get(errors, nameDecisionReviewTypes)?.message}
-            inputRef={ref}
-            label="Decision Review Type"
-            multi
-            onChange={onChange}
-            options={DROPDOWN_OPTIONS}
+    <div className={classNames}>
+      {hasFormErrors ?
+        <div className="usa-input-error-message" style={{ padding: 0 }}>{errorMessage}</div> :
+        null
+      }
+      <div className="decisionReviewCheckboxContainer">
+        {CHECKBOX_OPTIONS.map((checkbox) => (
+          <Checkbox
+            defaultValue={field.options?.[checkbox.name]}
+            key={`checkbox-${checkbox.name}`}
+            inputRef={register}
+            label={checkbox.label}
+            name={`${name}.options.${checkbox.name}`}
+            unpadded
           />
-        )}
-      />
+        ))}
+      </div>
     </div>
   );
 };
 
 DecisionReviewType.propTypes = {
-  control: PropTypes.object,
   field: PropTypes.object,
   name: PropTypes.string,
+  register: PropTypes.func
 };
diff --git a/client/app/nonComp/pages/ReportPage.jsx b/client/app/nonComp/pages/ReportPage.jsx
index d8753e6fa53..3e3a7ba89a8 100644
--- a/client/app/nonComp/pages/ReportPage.jsx
+++ b/client/app/nonComp/pages/ReportPage.jsx
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import React, { useEffect } from 'react';
 import { useController, useForm, FormProvider, useFormContext } from 'react-hook-form';
 import { useDispatch, useSelector } from 'react-redux';
@@ -6,7 +5,6 @@ import { downloadReportCSV } from 'app/nonComp/actions/changeHistorySlice';
 import { css } from 'glamor';
 import PropTypes from 'prop-types';
 
-import Alert from 'app/components/Alert';
 import Button from 'app/components/Button';
 import NonCompLayout from '../components/NonCompLayout';
 import { conditionsSchema, ReportPageConditions } from '../components/ReportPage/ReportPageConditions';
@@ -29,7 +27,7 @@ import {
   RADIO_STATUS_OPTIONS,
   RADIO_STATUS_REPORT_TYPE_OPTIONS,
   SPECIFIC_STATUS_OPTIONS,
-  SPECIFIC_EVENT_OPTIONS
+  SPECTIFIC_EVENT_OPTIONS
 } from 'constants/REPORT_TYPE_CONSTANTS';
 import * as ERRORS from 'constants/REPORT_PAGE_VALIDATION_ERRORS';
 
@@ -44,13 +42,6 @@ const buttonOuterContainerStyling = css({
   marginTop: '4rem',
 });
 
-const outerContainerStyling = css({
-  display: 'flex',
-  justifyContent: 'space-between',
-  paddingLeft: '30px',
-  gap: '3em',
-});
-
 const specificEventTypeSchema = yup.lazy((value) => {
   // eslint-disable-next-line no-undefined
   if (value === undefined) {
@@ -61,22 +52,13 @@ const specificEventTypeSchema = yup.lazy((value) => {
     added_decision_date: yup.boolean(),
     added_issue: yup.boolean(),
     added_issue_no_decision_date: yup.boolean(),
-    removed_issue: yup.boolean(),
-    withdrew_issue: yup.boolean(),
-    completed_disposition: yup.boolean(),
     claim_created: yup.boolean(),
     claim_closed: yup.boolean(),
     claim_status_incomplete: yup.boolean(),
-    claim_status_pending: yup.boolean(),
     claim_status_inprogress: yup.boolean(),
-    requested_issue_modification: yup.boolean(),
-    requested_issue_addition: yup.boolean(),
-    requested_issue_removal: yup.boolean(),
-    requested_issue_withdrawal: yup.boolean(),
-    approval_of_request: yup.boolean(),
-    rejection_of_request: yup.boolean(),
-    cancellation_of_request: yup.boolean(),
-    edit_of_request: yup.boolean(),
+    completed_disposition: yup.boolean(),
+    removed_issue: yup.boolean(),
+    withdrew_issue: yup.boolean(),
   }).test('at-least-one-true', ERRORS.AT_LEAST_ONE_OPTION, (obj) => {
     return Object.values(obj).some((val) => val === true);
   });
@@ -148,98 +130,45 @@ const ReportPageButtons = ({
   );
 };
 
-const EventCheckboxGroup = ({ header, options, name, onChange }) => {
-
-  return (
-    <div>
-      { header && <h4>{header}</h4> }
-      {options.map((option) => (
-        <div key={option.id}>
-          <Checkbox
-            name={`${name}.${option.id}`}
-            key={`${name}.${option.id}`}
-            label={option.label}
-            stronglabel
-            unpadded
-            onChange={(val) => onChange({ option, val })}
-          />
-        </div>
-      ))}
-    </div>
-  );
-};
-
 const RHFCheckboxGroup = ({ options, name, control }) => {
-  const { errors } = useFormContext();
-
-  let fieldClasses = 'checkbox';
-  const errorMessage = get(errors, name)?.message;
-
   const { field } = useController({
     control,
     name
   });
 
-  if (errorMessage) {
-    fieldClasses += ' usa-input-error';
-    fieldClasses += ' less-error-padding';
-  }
+  const { errors } = useFormContext();
 
   const [value, setValue] = React.useState({});
 
-  const onCheckboxClick = ({ option, val }) => {
-    value[option.id] = val;
-    field.onChange(value);
-    setValue(value);
-  };
+  let fieldClasses = 'checkbox';
 
-  const messageStyling = css({
-    fontSize: '17px !important',
-    paddingTop: '2px !important'
-  });
+  const errorMessage = get(errors, name)?.message;
+
+  if (errorMessage) {
+    fieldClasses += ' usa-input-error';
+    fieldClasses += ' less-error-padding';
+  }
 
   return (
-    <div>
-      {name === 'specificEventType' ?
-        <fieldset>
-          {errorMessage &&
-            <Alert
-              type="error"
-              message={ERRORS.AT_LEAST_ONE_CHECKBOX_OPTION}
-              messageStyling={messageStyling}
-            />
-          }
-          <div {...outerContainerStyling} style={{ paddingTop: '30px' }} >
-            <EventCheckboxGroup
-              header="System"
-              options={options[0].system}
-              name={name}
-              onChange={onCheckboxClick}
-            />
-            <EventCheckboxGroup
-              header="General"
-              options={options[0].general}
-              name={name}
-              onChange={onCheckboxClick}
-            />
-            <EventCheckboxGroup
-              header="Requests"
-              options={options[0].requests}
-              name={name}
-              onChange={onCheckboxClick}
-            />
-          </div>
-        </fieldset> :
-        <fieldset className={fieldClasses} style={{ paddingLeft: '30px' }}>
-          {errorMessage ? <div className="usa-input-error-message">{ errorMessage }</div> : null}
-          <EventCheckboxGroup
-            options={options}
-            name={name}
-            onChange={onCheckboxClick}
+    <fieldset className={fieldClasses} style={{ paddingLeft: '30px' }}>
+      {errorMessage ? <div className="usa-input-error-message">{ errorMessage }</div> : null}
+      {options.map((option) => (
+        <div key={option.id}>
+          <Checkbox
+            name={`${name}.${option.id}`}
+            key={`${name}.${option.id}`}
+            label={option.label}
+            stronglabel
+            onChange={(val) => {
+              value[option.id] = val;
+              field.onChange(value);
+              setValue(value);
+            }}
+            unpadded
           />
-        </fieldset>
-      }
-    </div>
+        </div>
+      ))}
+    </fieldset>
   );
 };
 
@@ -281,30 +210,20 @@ const ReportPage = ({ history }) => {
     specificStatus: {
       incomplete: '',
       in_progress: '',
-      pending: '',
       completed: '',
       cancelled: ''
     },
     specificEventType: {
+      added_decision_date: '',
+      added_issue: '',
+      added_issue_no_decision_date: '',
       claim_created: '',
       claim_closed: '',
       claim_status_incomplete: '',
-      claim_status_pending: '',
       claim_status_inprogress: '',
-      added_decision_date: '',
-      added_issue: '',
-      added_issue_no_decision_date: '',
+      completed_disposition: '',
       removed_issue: '',
       withdrew_issue: '',
-      completed_disposition: '',
-      requested_issue_modification: '',
-      requested_issue_addition: '',
-      requested_issue_removal: '',
-      requested_issue_withdrawal: '',
-      approval_of_request: '',
-      rejection_of_request: '',
-      cancellation_of_request: '',
-      edit_of_request: '',
     }
   };
 
@@ -328,12 +247,14 @@ const ReportPage = ({ history }) => {
     let formattedOptions;
 
     switch (condition) {
+    case 'decisionReviewType':
+      formattedOptions = Object.keys(options).filter((key) => options[key]);
+      break;
     // Multi select conditions
     case 'personnel':
     case 'facility':
     case 'issueDisposition':
     case 'issueType':
-    case 'decisionReviewType':
       formattedOptions = Object.values(options)[0].map((item) => item.value);
       break;
     // Else it is probably already an object, so it just pass the existing options
@@ -453,7 +374,7 @@ const ReportPage = ({ history }) => {
           {watchReportType === 'event_type_action' &&
           watchRadioEventAction === 'specific_events_action' ? (
               <RHFCheckboxGroup
-                options={SPECIFIC_EVENT_OPTIONS}
+                options={SPECTIFIC_EVENT_OPTIONS}
                 control={control}
                 name="specificEventType"
               />
@@ -490,13 +411,6 @@ RHFCheckboxGroup.propTypes = {
   errorMessage: PropTypes.string
 };
 
-EventCheckboxGroup.propTypes = {
-  options: PropTypes.array,
-  onChange: PropTypes.func,
-  header: PropTypes.string,
-  name: PropTypes.string
-};
-
 RHFRadioButton.propTypes = {
   options: PropTypes.array,
   control: PropTypes.object,
@@ -505,4 +419,3 @@ RHFRadioButton.propTypes = {
 };
 
 export default ReportPage;
-/* eslint-enable max-lines */
diff --git a/client/app/nonComp/util/index.js b/client/app/nonComp/util/index.js
index b554aca56b5..e0f14eb7587 100644
--- a/client/app/nonComp/util/index.js
+++ b/client/app/nonComp/util/index.js
@@ -109,11 +109,6 @@ const parseDecisionReviewTypeFilterOptions = (taskCounts, enabledFilters) =>
         value: 'BoardGrantEffectuationTask',
         displayText: `Board Grant (${taskCount})`
       };
-    } else if (key.includes('Remand')) {
-      taskInfo = {
-        value: 'Remand',
-        displayText: `Remand (${taskCount})`
-      };
     }
 
     return { ...taskInfo, checked: enabledFilters?.includes(taskInfo.value) || false };
diff --git a/client/app/queue/caseEvaluation/EvaluateDecisionView.jsx b/client/app/queue/caseEvaluation/EvaluateDecisionView.jsx
index 9dc32c135c9..60d48ea53e5 100644
--- a/client/app/queue/caseEvaluation/EvaluateDecisionView.jsx
+++ b/client/app/queue/caseEvaluation/EvaluateDecisionView.jsx
@@ -308,8 +308,8 @@ const mapStateToProps = (state, ownProps) => {
 
   // previousTaskAssignedOn comes from
   // eslint-disable-next-line max-len
-  // Legacy: https://github.com/department-of-veterans-affairs/caseflow/blob/main/app/models/legacy_tasks/judge_legacy_task.rb#L17
-  // AMA: https://github.com/department-of-veterans-affairs/caseflow/blob/main/app/models/tasks/judge_task.rb#L42
+  // Legacy: https://github.com/department-of-veterans-affairs/caseflow/blob/master/app/models/legacy_tasks/judge_legacy_task.rb#L17
+  // AMA: https://github.com/department-of-veterans-affairs/caseflow/blob/master/app/models/tasks/judge_task.rb#L42
   const judgeDecisionReviewTask = taskById(state, { taskId: ownProps.taskId });
 
   // When canceling out of Evaluate Decision page need to check if appeal exists otherwise failures occur
diff --git a/client/app/styles/_main.scss b/client/app/styles/_main.scss
index e1e2afdee6e..9f62a821db6 100644
--- a/client/app/styles/_main.scss
+++ b/client/app/styles/_main.scss
@@ -116,12 +116,6 @@ body {
 }
 
 // Used for Caseflow app header rendered in React
-nav {
-  &.cf-push-left p a {
-    color: $color-gray-dark;
-  }
-}
-
 .cf-wide-app {
   .usa-grid {
     padding-left: 0;
diff --git a/client/app/styles/react/_alerts.scss b/client/app/styles/react/_alerts.scss
index beeefabdb1e..085d3018a68 100644
--- a/client/app/styles/react/_alerts.scss
+++ b/client/app/styles/react/_alerts.scss
@@ -1,94 +1,3 @@
-.no-env-color {
-  display: none;
-}
-
-.prodtest-env-color {
-  color: $color-black-light;
-}
-
-.preprod-env-color {
-  color: $color-secondary;
-}
-
-.uat-env-color {
-  color: $color-primary-alt;
-}
-
-.demo-env-color {
-  color: $color-green-light;
-}
-
-.no-env-alert {
-  .usa-alert {
-    display: none;
-  }
-}
-
-.prodtest-env-alert {
-
-  .usa-alert {
-    background-color: $color-gold-lightest;
-    border-left: 5px solid $color-gold-lighter;
-    background-image: url('/images/warning-429d7a1540c2e7d036805bb73a0ba690.png');
-
-    .usa-alert-text {
-      padding-left: 1.5rem;
-    }
-
-    &::before {
-      background-color: $color-gold-lightest;
-    }
-  }
-}
-
-.preprod-env-alert {
-
-  .usa-alert {
-    background-color: $color-secondary-lightest;
-    border-left: 5px solid $color-secondary-light;
-    background-image: url('/images/warning-429d7a1540c2e7d036805bb73a0ba690.png');
-
-    .usa-alert-text {
-      padding-left: 1.5rem;
-    }
-
-    &::before {
-      background-color: $color-secondary-lightest;
-    }
-  }
-}
-
-.uat-env-alert {
-  .usa-alert {
-    background-color: $color-primary-alt-lightest;
-    border-left: 5px solid $color-primary-alt-light;
-    background-image: url('/images/warning-429d7a1540c2e7d036805bb73a0ba690.png');
-
-    .usa-alert-text {
-      padding-left: 1.5rem;
-    }
-
-    &::before {
-      background-color: $color-primary-alt-lightest;
-    }
-  }
-}
-
-.demo-env-alert {
-  .usa-alert {
-    background-color: $color-green-lightest;
-    border-left: 5px solid $color-green-lighter;
-    background-image: url('/images/warning-429d7a1540c2e7d036805bb73a0ba690.png');
-
-    .usa-alert-text {
-      padding-left: 1.5rem;
-    }
-
-    &::before {
-      background-color: $color-green-lightest;
-    }
-  }
-}
 
 .usa-alert {
 
@@ -105,7 +14,6 @@
   &.usa-alert-slim {
     background-size: 4rem;
 
-
     .usa-alert-body {
       padding-left: 3.5rem;
     }
diff --git a/client/app/util/ApiUtil.js b/client/app/util/ApiUtil.js
index 37e8341c554..3e4a03540ce 100644
--- a/client/app/util/ApiUtil.js
+++ b/client/app/util/ApiUtil.js
@@ -65,7 +65,7 @@ const errorHandling = (url, error, method, options = {}) => {
   options.end = moment().format();
   options.duration = options.t1 - options.t0;
 
-  // Need to renable this check before going to main
+  // Need to renable this check before going to master
   if (options?.metricsLogRestError) {
     const data = {
       metric: {
@@ -95,7 +95,7 @@ const successHandling = (url, res, method, options = {}) => {
   const id = uuid.v4();
   const message = `UUID: ${id}.\nSuccess with ${method} ${url}.\n${res.status}`;
 
-  // Need to renable this check before going to main
+  // Need to renable this check before going to master
   options.t1 = performance.now();
   options.end = moment().format();
   options.duration = options.t1 - options.t0;
diff --git a/client/constants/REPORT_PAGE_VALIDATION_ERRORS.json b/client/constants/REPORT_PAGE_VALIDATION_ERRORS.json
index 17ec7ce7621..6757f9945d4 100644
--- a/client/constants/REPORT_PAGE_VALIDATION_ERRORS.json
+++ b/client/constants/REPORT_PAGE_VALIDATION_ERRORS.json
@@ -8,6 +8,5 @@
   "END_DATE_SMALL": "End date must be greater than the start date",
   "DATE_FUTURE": "Date cannot be in the future",
   "AT_LEAST_ONE_OPTION": "Please select at least one option",
-  "AT_LEAST_ONE_CHECKBOX_OPTION": "Please select at least one checkbox from one of the sections below.",
   "MISSING_PERSONNEL": "Please select at least one team member"
 }
diff --git a/client/constants/REPORT_TYPE_CONSTANTS.json b/client/constants/REPORT_TYPE_CONSTANTS.json
index 739bf7caf22..f84e99bb1c2 100644
--- a/client/constants/REPORT_TYPE_CONSTANTS.json
+++ b/client/constants/REPORT_TYPE_CONSTANTS.json
@@ -46,10 +46,6 @@
       "label": "Incomplete",
       "id": "incomplete"
     },
-    {
-      "label": "Pending",
-      "id": "pending"
-    },
     {
       "label": "In Progress",
       "id": "in_progress"
@@ -63,90 +59,46 @@
       "id": "cancelled"
     }
   ],
-  "SPECIFIC_EVENT_OPTIONS": [
-    {
-      "system": [
-        {
-          "label": "Claim created",
-          "id":"claim_created"
-        },
-        {
-          "label": "Claim closed",
-          "id":"claim_closed"
-        },
-        {
-          "label": "Claim status - Incomplete",
-          "id":"claim_status_incomplete"
-        },
-        {
-          "label": "Claim status - Pending",
-          "id":"claim_status_pending"
-        },
-        {
-          "label": "Claim status - In progress",
-          "id":"claim_status_inprogress"
-        }
-      ],
-      "general": [
-        {
-          "label": "Added decision date",
-          "id": "added_decision_date"
-        },
-        {
-          "label": "Added issue",
-          "id": "added_issue"
-        },
-        {
-          "label": "Added issue - No decision date",
-          "id":"added_issue_no_decision_date"
-        },
-        {
-          "label": "Removed issue",
-          "id":"removed_issue"
-        },
-        {
-          "label": "Withdrew issue",
-          "id":"withdrew_issue"
-        },
-        {
-          "label": "Completed disposition",
-          "id":"completed_disposition"
-        }
-      ],
-      "requests": [
-        {
-          "label": "Requested issue modification",
-          "id":"requested_issue_modification"
-        },
-        {
-          "label": "Requested issue addition",
-          "id":"requested_issue_addition"
-        },
-        {
-          "label": "Requested issue removal",
-          "id":"requested_issue_removal"
-        },
-        {
-          "label": "Requested issue withdrawal",
-          "id":"requested_issue_withdrawal"
-        },
-        {
-          "label": "Approval of request",
-          "id":"approval_of_request"
-        },
-        {
-          "label": "Rejection of request",
-          "id":"rejection_of_request"
-        },
-        {
-          "label": "Cancellation of request",
-          "id":"cancellation_of_request"
-        },
-        {
-          "label": "Edit of request",
-          "id":"edit_of_request"
-        }
-      ]
+  "SPECTIFIC_EVENT_OPTIONS": [
+    {
+      "label": "Added decision date",
+      "id": "added_decision_date"
+    },
+    {
+      "label": "Added issue",
+      "id": "added_issue"
+    },
+    {
+      "label": "Added issue - No decision date",
+      "id":"added_issue_no_decision_date"
+    },
+    {
+      "label": "Claim created",
+      "id":"claim_created"
+    },
+    {
+      "label": "Claim closed",
+      "id":"claim_closed"
+    },
+    {
+      "label": "Claim status - Incomplete",
+      "id":"claim_status_incomplete"
+    },
+    {
+      "label": "Claim status - In progress",
+      "id":"claim_status_inprogress"
+    },
+    {
+      "label": "Completed disposition",
+      "id":"completed_disposition"
+    },
+    {
+      "label": "Removed issue",
+      "id":"removed_issue"
+    },
+    {
+      "label": "Withdrew issue",
+      "id":"withdrew_issue"
     }
   ],
   "TIMING_SPECIFIC_OPTIONS": [
diff --git a/client/package.json b/client/package.json
index 820ec8426d5..9e36b57290d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,7 +15,7 @@
     "test:jest:watch": "NODE_ENV=test jest --watch",
     "test:jest:update": "NODE_ENV=test jest --updateSnapshot",
     "test:legacy:watch": "yarn run test:legacy --watch",
-    "lint": "eslint --max-warnings 0 --cache $(git diff --name-only --diff-filter=d --relative $(git merge-base $(git rev-parse --abbrev-ref HEAD) origin/main) *.js *.jsx)",
+    "lint": "eslint --max-warnings 0 --cache $(git diff --name-only --diff-filter=d --relative $(git merge-base $(git rev-parse --abbrev-ref HEAD) origin/master) *.js *.jsx)",
     "lint:fix": "yarn run lint --fix",
     "pretty": "yarn run prettier constants/TASK_ACTIONS.json",
     "pretty:check": "yarn run pretty --check",
@@ -60,7 +60,7 @@
     "@babel/preset-react": "^7.12.7",
     "@babel/register": "^7.12.1",
     "@babel/runtime-corejs2": "^7.12.5",
-    "@department-of-veterans-affairs/caseflow-frontend-toolkit": "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#fa44cf3e",
+    "@department-of-veterans-affairs/caseflow-frontend-toolkit": "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#a98b291",
     "@fortawesome/fontawesome-free": "^5.3.1",
     "@hookform/resolvers": "^2.0.0-beta.5",
     "@reduxjs/toolkit": "^1.9.7",
diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
index 3c0a2c04db3..a467c6c7045 100644
--- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
+++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap
@@ -4,7 +4,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
 <div>
   <div>
     <header
-      style="background: rgb(255, 255, 255); line-height: 4em;"
+      data-css-uo1yys=""
     >
       <div>
         <div
@@ -12,13 +12,13 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
         >
           <nav
             class="cf-push-left"
-            style="display: flex; align-items: center; line-height: 4em;"
+            data-css-1vh8afw=""
           >
             <a
               href="/dispatch/establish-claim/"
             >
               <p
-                style="margin: 0px; display: inline-block; font-size: 1.7rem; font-weight: 900; line-height: 4em;"
+                data-css-14vgq4z=""
               >
                 <a
                   href="/dispatch/establish-claim/"
@@ -59,7 +59,6 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
                     class="cf-application-title"
                     data-css-1mdtwij=""
                     id="page-title"
-                    style="padding-left: .3em;"
                     tabindex="-1"
                   >
                     Dispatch
@@ -94,7 +93,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
         </div>
       </div>
       <div
-        style="border-bottom: 1px solid #d6d7d9; clear: both;"
+        data-css-1tukvsd=""
       >
          
       </div>
diff --git a/client/test/app/nonComp/pages/ReportPage.test.js b/client/test/app/nonComp/pages/ReportPage.test.js
index 80bf888ccaf..502d9832392 100644
--- a/client/test/app/nonComp/pages/ReportPage.test.js
+++ b/client/test/app/nonComp/pages/ReportPage.test.js
@@ -13,7 +13,6 @@ import { getVhaUsers } from 'test/helpers/reportPageHelper';
 import CombinedNonCompReducer from 'app/nonComp/reducers';
 
 import REPORT_TYPE_CONSTANTS from 'constants/REPORT_TYPE_CONSTANTS';
-import * as ERRORS from 'constants/REPORT_PAGE_VALIDATION_ERRORS';
 
 describe('ReportPage', () => {
   const setup = (storeValues = {}) => {
@@ -196,34 +195,28 @@ describe('ReportPage', () => {
 
     it('shows the correct checkbox fields', async () => {
       await navigateToConditionInput('Decision Review Type');
-      const dropdown = screen.getByLabelText('Decision Review Type');
 
-      await selectEvent.select(dropdown, ['Higher-Level Reviews']);
-      expect(screen.getByText('Higher-Level Reviews')).toBeInTheDocument();
-
-      await selectEvent.select(dropdown, ['Supplemental Claims']);
-      expect(screen.getByText('Supplemental Claims')).toBeInTheDocument();
-
-      await selectEvent.select(dropdown, ['Remands']);
       expect(screen.getByText('Higher-Level Reviews')).toBeInTheDocument();
       expect(screen.getByText('Supplemental Claims')).toBeInTheDocument();
-      expect(screen.getByText('Remands')).toBeInTheDocument();
     });
 
-    it('renders an error if no selection is made', async () => {
+    it('clicking the checkbox should toggle the checked status', async () => {
       await navigateToConditionInput('Decision Review Type');
 
-      const generateTaskReport = screen.getByRole('button', { name: 'Generate task report' });
+      const checkbox = screen.getByLabelText('Higher-Level Reviews');
 
-      expect(generateTaskReport).not.toHaveClass('usa-button-disabled');
+      await userEvent.click(checkbox);
+      expect(checkbox.checked).toEqual(true);
 
-      // Wait for the validation text to appear before making assertions
-      await fireEvent.click(generateTaskReport);
-      await waitFor(() => {
-        const validationText = screen.getByText('Please select at least one option');
+      await userEvent.click(checkbox);
+      expect(checkbox.checked).toEqual(false);
 
-        expect(validationText).toBeInTheDocument();
-      });
+    });
+
+    it('should render an error if no checkbox is checked', async () => {
+      await navigateToConditionInput('Decision Review Type');
+      expect(screen.getByText('Higher-Level Reviews')).toBeInTheDocument();
+      await checkForValidationText('Please select at least one option');
     });
   });
 
@@ -382,7 +375,7 @@ describe('ReportPage', () => {
 
     });
 
-    it('should add 19 checkboxes when radio Specific Events/ Actions is clicked', async () => {
+    it('should add 10 checkboxes when radio Specific Events/ Actions is clicked', async () => {
       setup();
 
       await selectEvent.select(screen.getByLabelText('Report Type'), ['Status', 'Event / Action']);
@@ -393,17 +386,9 @@ describe('ReportPage', () => {
       expect(specificEvents.length).toBe(1);
 
       fireEvent.click(screen.getByLabelText('Specific Events / Actions'));
-      expect(screen.getAllByRole('checkbox').length).toBe(19);
-
-      REPORT_TYPE_CONSTANTS.SPECIFIC_EVENT_OPTIONS[0].system.forEach((option) => {
-        expect(screen.getAllByText(option.label)).toBeTruthy();
-      });
-
-      REPORT_TYPE_CONSTANTS.SPECIFIC_EVENT_OPTIONS[0].general.forEach((option) => {
-        expect(screen.getAllByText(option.label)).toBeTruthy();
-      });
+      expect(screen.getAllByRole('checkbox').length).toBe(10);
 
-      REPORT_TYPE_CONSTANTS.SPECIFIC_EVENT_OPTIONS[0].requests.forEach((option) => {
+      REPORT_TYPE_CONSTANTS.SPECTIFIC_EVENT_OPTIONS.forEach((option) => {
         expect(screen.getAllByText(option.label)).toBeTruthy();
       });
     });
@@ -422,14 +407,14 @@ describe('ReportPage', () => {
 
         fireEvent.click(screen.getByLabelText('Specific Events / Actions'));
 
-        expect(screen.getAllByRole('checkbox').length).toBe(19);
+        expect(screen.getAllByRole('checkbox').length).toBe(10);
 
         const generateTaskReport = screen.getByRole('button', { name: /Generate task report/i });
 
         await userEvent.click(generateTaskReport);
 
         await waitFor(() => {
-          expect(screen.getAllByText(ERRORS.AT_LEAST_ONE_CHECKBOX_OPTION).length).toBe(1);
+          expect(screen.getAllByText('Please select at least one option').length).toBe(1);
         });
 
       });
@@ -445,7 +430,7 @@ describe('ReportPage', () => {
       expect(specificEvents.length).toBe(1);
 
       fireEvent.click(screen.getByLabelText('Specific Status'));
-      expect(screen.getAllByRole('checkbox').length).toBe(5);
+      expect(screen.getAllByRole('checkbox').length).toBe(4);
 
       REPORT_TYPE_CONSTANTS.SPECIFIC_STATUS_OPTIONS.map((option) =>
         expect(screen.getAllByText(option.label)).toBeTruthy()
diff --git a/client/test/app/nonComp/pages/__snapshots__/ClaimHistoryPage.test.js.snap b/client/test/app/nonComp/pages/__snapshots__/ClaimHistoryPage.test.js.snap
index 2c211e5097e..da3dc91ccc1 100644
--- a/client/test/app/nonComp/pages/__snapshots__/ClaimHistoryPage.test.js.snap
+++ b/client/test/app/nonComp/pages/__snapshots__/ClaimHistoryPage.test.js.snap
@@ -388,34 +388,32 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        <b>
-                          Benefit type: 
-                        </b>
-                        Veterans Health Administration
-                        <br />
-                        <b>
-                          Issue type: 
-                        </b>
-                        Other
-                        <br />
-                        <b>
-                          Issue description: 
-                        </b>
-                        issue added after removing unidentified issues
-                        <br />
-                        <b>
-                          Decision date: 
-                        </b>
-                        09/12/2023
-                        <br />
-                        <b>
-                          Removed issue date: 
-                        </b>
-                        02/23/2024
-                      </p>
-                    </div>
+                    <p>
+                      <b>
+                        Benefit type: 
+                      </b>
+                      Veterans Health Administration
+                      <br />
+                      <b>
+                        Issue type: 
+                      </b>
+                      Other
+                      <br />
+                      <b>
+                        Issue description: 
+                      </b>
+                      issue added after removing unidentified issues
+                      <br />
+                      <b>
+                        Decision date: 
+                      </b>
+                      09/12/2023
+                      <br />
+                      <b>
+                        Removed issue date: 
+                      </b>
+                      02/23/2024
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -453,30 +451,28 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        <b>
-                          Benefit type: 
-                        </b>
-                        Veterans Health Administration
-                        <br />
-                        <b>
-                          Issue type: 
-                        </b>
-                        Beneficiary Travel
-                        <br />
-                        <b>
-                          Issue description: 
-                        </b>
-                        go fly
-                        <br />
-                        <b>
-                          Decision date: 
-                        </b>
-                        02/23/2024
-                        <br />
-                      </p>
-                    </div>
+                    <p>
+                      <b>
+                        Benefit type: 
+                      </b>
+                      Veterans Health Administration
+                      <br />
+                      <b>
+                        Issue type: 
+                      </b>
+                      Beneficiary Travel
+                      <br />
+                      <b>
+                        Issue description: 
+                      </b>
+                      go fly
+                      <br />
+                      <b>
+                        Decision date: 
+                      </b>
+                      02/23/2024
+                      <br />
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -514,33 +510,31 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        <b>
-                          Benefit type: 
-                        </b>
-                        Veterans Health Administration
-                        <br />
-                        <b>
-                          Issue type: 
-                        </b>
-                        <br />
-                        <b>
-                          Issue description: 
-                        </b>
-                        unidentified issue description
-                        <br />
-                        <b>
-                          Decision date: 
-                        </b>
-                        No decision date
-                        <br />
-                        <b>
-                          Removed issue date: 
-                        </b>
-                        12/12/2023
-                      </p>
-                    </div>
+                    <p>
+                      <b>
+                        Benefit type: 
+                      </b>
+                      Veterans Health Administration
+                      <br />
+                      <b>
+                        Issue type: 
+                      </b>
+                      <br />
+                      <b>
+                        Issue description: 
+                      </b>
+                      unidentified issue description
+                      <br />
+                      <b>
+                        Decision date: 
+                      </b>
+                      No decision date
+                      <br />
+                      <b>
+                        Removed issue date: 
+                      </b>
+                      12/12/2023
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -578,30 +572,28 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        <b>
-                          Benefit type: 
-                        </b>
-                        Veterans Health Administration
-                        <br />
-                        <b>
-                          Issue type: 
-                        </b>
-                        Other
-                        <br />
-                        <b>
-                          Issue description: 
-                        </b>
-                        issue added after removing unidentified issues
-                        <br />
-                        <b>
-                          Decision date: 
-                        </b>
-                        09/12/2023
-                        <br />
-                      </p>
-                    </div>
+                    <p>
+                      <b>
+                        Benefit type: 
+                      </b>
+                      Veterans Health Administration
+                      <br />
+                      <b>
+                        Issue type: 
+                      </b>
+                      Other
+                      <br />
+                      <b>
+                        Issue description: 
+                      </b>
+                      issue added after removing unidentified issues
+                      <br />
+                      <b>
+                        Decision date: 
+                      </b>
+                      09/12/2023
+                      <br />
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -639,11 +631,9 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        Claim can be processed.
-                      </p>
-                    </div>
+                    <p>
+                      Claim can be processed.
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -681,29 +671,27 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        <b>
-                          Benefit type: 
-                        </b>
-                        Veterans Health Administration
-                        <br />
-                        <b>
-                          Issue type: 
-                        </b>
-                        <br />
-                        <b>
-                          Issue description: 
-                        </b>
-                        unidentified issue description
-                        <br />
-                        <b>
-                          Decision date: 
-                        </b>
-                        No decision date
-                        <br />
-                      </p>
-                    </div>
+                    <p>
+                      <b>
+                        Benefit type: 
+                      </b>
+                      Veterans Health Administration
+                      <br />
+                      <b>
+                        Issue type: 
+                      </b>
+                      <br />
+                      <b>
+                        Issue description: 
+                      </b>
+                      unidentified issue description
+                      <br />
+                      <b>
+                        Decision date: 
+                      </b>
+                      No decision date
+                      <br />
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -741,11 +729,9 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        Claim cannot be processed until decision date is entered.
-                      </p>
-                    </div>
+                    <p>
+                      Claim cannot be processed until decision date is entered.
+                    </p>
                   </td>
                 </tr>
                 <tr
@@ -783,11 +769,9 @@ exports[`ClaimHistoryPage renders correctly for Admin user renders correctly 1`]
                     role="gridcell"
                     tabindex="-1"
                   >
-                    <div>
-                      <p>
-                        Claim created.
-                      </p>
-                    </div>
+                    <p>
+                      Claim created.
+                    </p>
                   </td>
                 </tr>
               </tbody>
diff --git a/client/yarn.lock b/client/yarn.lock
index c844f0e37f6..d83474f96f3 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -2529,9 +2529,9 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@department-of-veterans-affairs/caseflow-frontend-toolkit@https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#fa44cf3e":
+"@department-of-veterans-affairs/caseflow-frontend-toolkit@https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#a98b291":
   version "2.6.1"
-  resolved "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#fa44cf3e009280d39275f16150990f8749b4818a"
+  resolved "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#a98b29188aaf2d85f7af749eda95cc02ed1282d2"
   dependencies:
     classnames "^2.2.5"
     glamor "^2.20.40"
diff --git a/config/boot.rb b/config/boot.rb
index 9b06e9b8a7f..54cda1cdcc7 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,9 +1,5 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 ENV["NLS_LANG"] = "AMERICAN_AMERICA.UTF8"
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
-
-# Pull this in before any other non-bundler/bootsnap gem to avoid SIGSEGV
-# during Oracle connection setup on arm64 architecture.
-require 'ruby-oci8'
+require "bundler/setup" # Set up gems listed in the Gemfile.
+require "bootsnap/setup" # Speed up boot time by caching expensive operations.
diff --git a/config/routes.rb b/config/routes.rb
index e0f15ef5319..3b14fac4202 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -302,7 +302,6 @@
     post 'edit_ep', on: :member
   end
   match '/supplemental_claims/:claim_id/edit/:any' => 'supplemental_claims#edit', via: [:get]
-  get '/remands(/*path)', to: redirect('/supplemental_claims/%{path}')
 
   resources :decision_reviews, param: :business_line_slug do
     resources :tasks, controller: :decision_reviews, param: :task_id, only: [:show, :update] do
diff --git a/db/migrate/20240716143816_add_type_column_and_index_to_supplemental_claims_for_remand_inheritance.rb b/db/migrate/20240716143816_add_type_column_and_index_to_supplemental_claims_for_remand_inheritance.rb
deleted file mode 100644
index f5e08799f29..00000000000
--- a/db/migrate/20240716143816_add_type_column_and_index_to_supplemental_claims_for_remand_inheritance.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class AddTypeColumnAndIndexToSupplementalClaimsForRemandInheritance < ActiveRecord::Migration[6.1]
-  include Caseflow::Migrations::AddIndexConcurrently
-
-  def change
-    safety_assured do
-      add_column :supplemental_claims, :type, :string, default: "SupplementalClaim", null: false, comment: "The class name for the single table inheritance type of Supplemental Claim for example Remand"
-    end
-
-    add_safe_index :supplemental_claims, [:type], name: "index_supplemental_claims_on_type"
-  end
-end
diff --git a/db/migrate/20240805154526_create_remands_view.rb b/db/migrate/20240805154526_create_remands_view.rb
deleted file mode 100644
index 80922efa246..00000000000
--- a/db/migrate/20240805154526_create_remands_view.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class CreateRemandsView < ActiveRecord::Migration[6.1]
-  def up
-    safety_assured do
-      execute <<-SQL
-        CREATE VIEW remands AS
-          SELECT *
-          FROM supplemental_claims
-          WHERE type = 'Remand';
-      SQL
-    end
-  end
-
-  def down
-    safety_assured do
-      execute <<-SQL
-        DROP VIEW remands;
-      SQL
-    end
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index fb88838b8ac..3afc92fdb92 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1877,13 +1877,11 @@
     t.boolean "filed_by_va_gov", comment: "Indicates whether or not this form came from VA.gov"
     t.boolean "legacy_opt_in_approved", comment: "Indicates whether a Veteran opted to withdraw their Supplemental Claim request issues from the legacy system if a matching issue is found. If there is a matching legacy issue and it is not withdrawn, then that issue is ineligible to be a new request issue and a contention will not be created for it."
     t.date "receipt_date", comment: "The date that the Supplemental Claim form was received by central mail. Only issues decided prior to the receipt date will show up as contestable issues.  It is also the claim date for any associated end products that are established. Supplemental Claims do not have the same timeliness restriction on contestable issues as Appeals and Higher Level Reviews."
-    t.string "type", default: "SupplementalClaim", null: false, comment: "The class name for the single table inheritance type of Supplemental Claim for example Remand"
     t.datetime "updated_at"
     t.uuid "uuid", default: -> { "uuid_generate_v4()" }, null: false, comment: "The universally unique identifier for the Supplemental Claim. Can be used to link to the claim after it is completed."
     t.string "veteran_file_number", null: false, comment: "PII. The file number of the Veteran that the Supplemental Claim is for."
     t.boolean "veteran_is_not_claimant", comment: "Indicates whether the Veteran is the claimant on the Supplemental Claim form, or if the claimant is someone else like a spouse or a child. Must be TRUE if the Veteran is deceased."
     t.index ["decision_review_remanded_type", "decision_review_remanded_id"], name: "index_decision_issues_on_decision_review_remanded"
-    t.index ["type"], name: "index_supplemental_claims_on_type"
     t.index ["updated_at"], name: "index_supplemental_claims_on_updated_at"
     t.index ["uuid"], name: "index_supplemental_claims_on_uuid"
     t.index ["veteran_file_number"], name: "index_supplemental_claims_on_veteran_file_number"
diff --git a/db/seeds/hearings.rb b/db/seeds/hearings.rb
index 6209ea3717f..dcb94aa4972 100644
--- a/db/seeds/hearings.rb
+++ b/db/seeds/hearings.rb
@@ -285,12 +285,14 @@ def created_by_user
     # rubocop:disable Metrics/MethodLength
     def create_hearing_subtree(appeal, hearing)
       root_task = create(:root_task, appeal: appeal)
-
-      distribution_task = create(:distribution_task, appeal: appeal, parent: root_task) if appeal.is_a?(Appeal)
-
+      distribution_task = create(
+        :distribution_task,
+        appeal: appeal,
+        parent: root_task
+      )
       parent_hearing_task = create(
         :hearing_task,
-        parent: appeal.is_a?(Appeal) ? distribution_task : root_task,
+        parent: distribution_task,
         appeal: appeal
       )
 
diff --git a/db/seeds/veterans_health_administration.rb b/db/seeds/veterans_health_administration.rb
index c3161f82d72..9183c93352e 100644
--- a/db/seeds/veterans_health_administration.rb
+++ b/db/seeds/veterans_health_administration.rb
@@ -54,7 +54,6 @@ def create_supplemental_claims
         3.times do
           CLAIMANT_TYPES.each do |claimant_type|
             create_sc_with_claimant(benefit_type, claimant_type)
-            create_sc_remand(benefit_type, claimant_type)
           end
         end
       end
@@ -63,7 +62,6 @@ def create_supplemental_claims
     def create_hlr_with_claimant(benefit_type, claimant_type)
       hlr = create(
         :higher_level_review,
-        :with_intake,
         :with_request_issue,
         :processed,
         benefit_type: benefit_type,
@@ -76,7 +74,6 @@ def create_hlr_with_claimant(benefit_type, claimant_type)
     def create_sc_with_claimant(benefit_type, claimant_type)
       sc = create(
         :supplemental_claim,
-        :with_intake,
         :with_request_issue,
         :processed,
         benefit_type: benefit_type,
@@ -86,16 +83,6 @@ def create_sc_with_claimant(benefit_type, claimant_type)
       sc.create_business_line_tasks!
     end
 
-    def create_sc_remand(benefit_type, claimant_type)
-      sc = create(
-        :remand,
-        benefit_type: benefit_type,
-        claimant_type: claimant_type,
-        number_of_claimants: 1
-      )
-      sc.create_business_line_tasks!
-    end
-
     # :reek:NestedIterators
     # this method is creating most of the data, but we can't get around it because of how many PO/VISN combos there are
     def create_vha_visn_pre_docket_queue
diff --git a/docs/tech-specs/2018-05-18-hearing-schedule.md b/docs/tech-specs/2018-05-18-hearing-schedule.md
index 076c8c5c97d..5a51355e4b3 100644
--- a/docs/tech-specs/2018-05-18-hearing-schedule.md
+++ b/docs/tech-specs/2018-05-18-hearing-schedule.md
@@ -1,11 +1,11 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingSchedule.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingSchedule.md).
 
 ## Caseflow Hearing Schedule
 
-Owner: Sharon Warner
-Date: 2018-05-18
-Reviewer(s):
-Review by:
+Owner: Sharon Warner  
+Date: 2018-05-18  
+Reviewer(s):   
+Review by:   
 
 ## Context
 
@@ -64,9 +64,9 @@ Because of the tight deadline, and the amount of data we need to input, we're go
 1) Hearings allocation
 1) Judge non-availability dates
 
-The RO non-availability dates, board non-availability dates, and hearings allocation will be uploaded together semi-annually, and the judge non-availability dates will be uploaded separately quarterly. The spreadsheet templates can be found [here](https://github.com/department-of-veterans-affairs/appeals-team/tree/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Designs).
+The RO non-availability dates, board non-availability dates, and hearings allocation will be uploaded together semi-annually, and the judge non-availability dates will be uploaded separately quarterly. The spreadsheet templates can be found [here](https://github.com/department-of-veterans-affairs/appeals-team/tree/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Designs).
 
-We will pull already-scheduled video and central office hearings and travel board hearings from VACOLS.
+We will pull already-scheduled video and central office hearings and travel board hearings from VACOLS. 
 
 ## Overview - December Release
 
@@ -98,29 +98,29 @@ The NonAvailability table will include information for all three types of non-av
 
 Each time a valid spreadsheet is uploaded, we'll record the dates that spreadsheet covers in SchedulePeriods. If a user uploads a second spreadsheet of the same type that covers date that have already been uploaded, we'll check to see if Finalized for the original spreadsheet is true or false. If Finalized is true, that means the information has already been uploaded to VACOLS, and we'll tell the user that they cannot re-upload a spreadsheet for those dates. If Finalized is false, we'll tell the user that they have already uploaded a spreadsheet for those dates and ask if they want to proceed. If the user wants to proceed, we'll delete all information associated with the original spreadsheet and then upload the new spreadsheet.
 
-We'll also check the following validations for each spreadsheet. If the uploaded spreadsheet breaks any of these validations, we'll ask the user to fix the error and re-upload the spreadsheet.
-
-1) The headers much match the template exactly.
+We'll also check the following validations for each spreadsheet. If the uploaded spreadsheet breaks any of these validations, we'll ask the user to fix the error and re-upload the spreadsheet.	
+	
+1) The headers much match the template exactly.	
 1) All dates should all be in this format: mm/dd/yyyy.
 1) All dates should be within the date range specified by the hearing coordinator.
 
 *RO Non-Availability*
 
-1) All BFREGOFF codes should match the city, state we have listed in regional_office.rb.
-1) Every RO listed in regional_office.rb should have a column.
-1) The dates listed for each RO should be unique.
+1) All BFREGOFF codes should match the city, state we have listed in regional_office.rb.	
+1) Every RO listed in regional_office.rb should have a column.	
+1) The dates listed for each RO should be unique.	
 
 *CO Non-Availability*
-
-1) The dates should be unique.
+	
+1) The dates should be unique.	
 
 *Judge Non-Availability*
-1) The CSS id and judge name should match what we already have stored in our database.
-
-*Hearing Allocations*
+1) The CSS id and judge name should match what we already have stored in our database.	
 
-1) All BFREGOFF codes should match the city, state we have listed in regional_office.rb.
-1) Every RO listed in regional_office.rb should have a row.
+*Hearing Allocations*	
+	
+1) All BFREGOFF codes should match the city, state we have listed in regional_office.rb.	
+1) Every RO listed in regional_office.rb should have a row.	
 
 **User Permissions (May)**
 
@@ -155,7 +155,7 @@ We'll create two new buckets within the dsva-appeals-caseflow-prod bucket to sto
     2. 2nd source is the travel board dates fetched from VACOLS
 4. Divide the number of hearing days for each RO by the number of months selected in the timeframe. (RO1: 12 for 6 months ) -> 2 days per month.
     1. It’s preferred to have RO hearing days distributed among the selected months (example:  if an RO has 2 hearing days; it’s preferred to have each hearing day distributed among different months)
-    2. A priority is given for ROs that have multiple rooms available since they can hold more hearings per day
+    2. A priority is given for ROs that have multiple rooms available since they can hold more hearings per day 
     3. It’s preferred to have whole number hearing days even if the hearing days cannot be evenly distributed ~ (if an RO has 25 hearing days, 25/6 = 4.16, each month shall have at least 4 hearing days for this RO and the remainder of days can be distributed among random months selected based on the calendar days available to the RO).
     4. If the RO hearing days cannot be distributed evenly among the selected months due to increased non-availability days for the month, the remaining hearings are distributed through out the other months based on the available calendars days for the RO)
 5. Select a random RO available date in the month to assign each of the divided RO hearing days.
@@ -194,8 +194,8 @@ To support querying for Travel Board hearings we need to add the following opera
     2. If a judge is on a travel board, it’s for an entire week
         1. No RO hearing days can be allocated to that judge a week prior or after the travel board week.
 
-Notes:
-There are three options for allocating judges:
+Notes: 
+There are three options for allocating judges: 
 
 1. Shuffle the judges and allocate the hearing days one at a time to all the judges (It doesn't verify complete balance, since it's randomized for the current scheduled period)
 2. Fetch all hearing days for all judges for the current federal fiscal year, allocate the hearing days to initially to the judges with the least amount of hearings to make sure the hearing days are evently distributed to all judges.
@@ -214,7 +214,7 @@ Example error:
 
 **August Rollout**
 
-Unfortunately, the hearing coordinators are required to build the schedule for the first six months of FY2019 before our August 1st roll-out date. However, the hearing coordinators will use Caseflow to assign those hearing days to judges and to build the schedule for the second six months of FY2019.
+Unfortunately, the hearing coordinators are required to build the schedule for the first six months of FY2019 before our August 1st roll-out date. However, the hearing coordinators will use Caseflow to assign those hearing days to judges and to build the schedule for the second six months of FY2019. 
 
 We will also create a test case that the hearing coordinators can use to create a mock hearing schedule for the first six months of FY2019. They can compare this mock schedule to the schedule they have already manually created to confirm the scheduling is working as expected.
 
diff --git a/docs/tech-specs/2018-06-21-vacols-caseflow-transition.md b/docs/tech-specs/2018-06-21-vacols-caseflow-transition.md
index 001e937ad2a..bb0331ed2e9 100644
--- a/docs/tech-specs/2018-06-21-vacols-caseflow-transition.md
+++ b/docs/tech-specs/2018-06-21-vacols-caseflow-transition.md
@@ -1,16 +1,16 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/VacolsCaseflowTransition.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/VacolsCaseflowTransition.md).
 
-## VACOLS to Caseflow Transition
+## VACOLS to Caseflow Transition  
 
-Owner: Oscar Ramirez
-Date: 2018-06-21 (Updated 2018-08-08)
-Reviewer(s): Sharon Warner, Alex Prokop
-Review by:  2018-08-13
+Owner: Oscar Ramirez  
+Date: 2018-06-21 (Updated 2018-08-08)  
+Reviewer(s): Sharon Warner, Alex Prokop  
+Review by:  2018-08-13  
 
 ## Context
-Once the AMA legislation goes live on February 14, 2019 the Board will assign appeals to specific hearing days, taking over a task performed by regional offices today. This technical specification outlines the events that need to take place to make this transition of responsibilities as smooth as possible
+Once the AMA legislation goes live on February 14, 2019 the Board will assign appeals to specific hearing days, taking over a task performed by regional offices today. This technical specification outlines the events that need to take place to make this transition of responsibilities as smooth as possible  
 
-## Overview
+## Overview 
 AMA appeals are any appeals processed under the workflow defined by the new legislation. AMA appeals will be processed exclusively in Caseflow, while Legacy appeals will continue to be stored in the VACOLS database. New Legacy Appeals may continue to flow into the system after February of 2019 as Veterans have up to a year to appeal a claim.
 
 For the August 2018 release of the Hearing Schedule product the calendar of hearing days allocated to regional offices will be stored in VACOLS. Regional offices will continue to manage slotting appeals to hearing days using the VACOLS UI.
@@ -21,7 +21,7 @@ When the AMA legislation is in place the calendar of hearing days will be stored
 
 This hearing type is discontinued for AMA appeals but we need to continue to support it while there are legacy appeals that chose this hearing in the system.
 
-A Travel Board Hearing Schedule is very different than the next two types of hearings. They are organized in trips that last several days. Each trip has one or more participants. The participants are one or more judges, and possibly one or more attorneys.
+A Travel Board Hearing Schedule is very different than the next two types of hearings. They are organized in trips that last several days. Each trip has one or more participants. The participants are one or more judges, and possibly one or more attorneys. 
 
 **Central Office Hearings**
 
@@ -33,7 +33,7 @@ These hearings will continue with the AMA legislation. The Veteran travels to a
 
 The Board allocates a certain number of hearing days for a Fiscal Year to each regional office based on the number of appeals requiring hearings.
 
-The ER diagram below highlights the different data attributes for each hearing type.
+The ER diagram below highlights the different data attributes for each hearing type. 
 
 ![Data Model](2018-06-21-hearing-schedule-data-model.png)
 
@@ -79,28 +79,28 @@ Once AMA hearings start, the audio files for these hearings may have to be store
 ## Reports
 The Hearing Management team is reviewing the existing reports to let us know which continue to be valid and need migration to Caseflow. Their review is ongoing as of this writing. A cursory review of the applications used by the Regional Offices and by Hearing Management reveals the following reports. There may be more but these are the obvious ones directly dealing with hearings data.
 
-vclrpts app
-Custom Rpts --> CO, Travel Board, Video Request Summary
-Annual Rpts -->  BVA Hearings Held
-
-Vacols3 app
-Hearings --> Video Hearings
-Hearings --> Travel Board Hearings
-Hearings --> CO Hearings
-
-Roaccess
-Hearings --> Travel Board Requests
-Hearings --> Formal Hearings Pending
-Hearings --> Formal Hearing Disposition Detail
-Hearings --> Forman Hearing Disposition Summary
-Hearings --> Certified BVA Awaiting Travel Board
-Hearings --> BVA VLJs --> Update Travel Board Docket
-Hearings --> BVA VLJs --> Update Video Docket           <-- Are these used by VLJs or Hearing Coordinators?
-Hearings --> BVA VLJs --> Update / Print CO Docket
-Hearings --> View/Print Virtual TB or Video Docket
-
-Mgmt Rpts --> BVA Hearing Schedule (TB, Video, CO)
-Mgmt Rpts --> BVA Hearing Disposition Summary by RO
+vclrpts app  
+Custom Rpts --> CO, Travel Board, Video Request Summary  
+Annual Rpts -->  BVA Hearings Held  
+
+Vacols3 app  
+Hearings --> Video Hearings  
+Hearings --> Travel Board Hearings  
+Hearings --> CO Hearings  
+
+Roaccess  
+Hearings --> Travel Board Requests  
+Hearings --> Formal Hearings Pending  
+Hearings --> Formal Hearing Disposition Detail  
+Hearings --> Forman Hearing Disposition Summary  
+Hearings --> Certified BVA Awaiting Travel Board  
+Hearings --> BVA VLJs --> Update Travel Board Docket  
+Hearings --> BVA VLJs --> Update Video Docket           <-- Are these used by VLJs or Hearing Coordinators?  
+Hearings --> BVA VLJs --> Update / Print CO Docket  
+Hearings --> View/Print Virtual TB or Video Docket  
+
+Mgmt Rpts --> BVA Hearing Schedule (TB, Video, CO)  
+Mgmt Rpts --> BVA Hearing Disposition Summary by RO  
 
 **NB: Outcome of Hearing Management report review may affect the data model as additional attributes may need to be associated with either individual hearings or the schedule.**
 
@@ -112,7 +112,7 @@ Mgmt Rpts --> BVA Hearing Disposition Summary by RO
 - appeal_id - how do we associate to both LegacyAppeal and Appeal models.
 - How is team assigned? Do we need it? In VACOLS UI the team field is populated based on what is on the staff table for the judge.
 - Remove veteran_id as this information can be fetched from the appeal.
-- Remove media_type? For hearings since September 2017 there were 25 which used cassette tape.
+- Remove media_type? For hearings since September 2017 there were 25 which used cassette tape. 
 - Rename media_problem to recording_problem.
 - Rename hold_days_vlj to hold_days. Does it generate an alert after n days?
 - Separate hearing prep data from hearings data? When appeal is rescheduled do we want to keep the hearings detail data? We would move the hearings row and associate it with another HearingDay row.
diff --git a/docs/tech-specs/2018-08-16-slotting-veterans.md b/docs/tech-specs/2018-08-16-slotting-veterans.md
index 1ad120cfdec..9606276f885 100644
--- a/docs/tech-specs/2018-08-16-slotting-veterans.md
+++ b/docs/tech-specs/2018-08-16-slotting-veterans.md
@@ -1,11 +1,11 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/SlottingVeterans.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/SlottingVeterans.md).
 
 ## Slotting Veterans - October 19th Release
 
-Owner: Sharon Warner
-Date: 2018-08-16
-Reviewer(s):
-Review by:
+Owner: Sharon Warner  
+Date: 2018-08-16  
+Reviewer(s):   
+Review by:   
 
 ## Context
 
@@ -18,7 +18,7 @@ While previously, RO hearing coordinators handled assigning veterans to hearing
 In order to allow our users to slot veterans to hearing days, we will provide two data elements:
 
 1) A list of veterans who are ready for hearings, filtered by RO and hearing type, and sorted by priority and docket order (CAVC, AOD, other)
-2) A list of upcoming hearing days, filtered by RO and hearing type, along with the number of available slots
+2) A list of upcoming hearing days, filtered by RO and hearing type, along with the number of available slots  
 
 The hearing coordinators will use these data elements to assign veterans to the appropriate hearing days. We will also build search functionality so hearing coordinators can search for individual cases.
 
@@ -66,12 +66,12 @@ The homepage for this functionality will exist at /hearings/schedule/assign.
 
 ## Rollout Plan
 
-**CO Hearings**— This functionality will be released October 19th, 2018. Our first user will be the Central Office Hearing Coordinator at the Board. They will use Caseflow to slot veterans for central office hearings. We confirmed with the Hearings Management Branch that all Central Office appeals to be scheduled area already available in Location 57, which is already part of their normal processes for scheduling CO hearings.
+**CO Hearings**— This functionality will be released October 19th, 2018. Our first user will be the Central Office Hearing Coordinator at the Board. They will use Caseflow to slot veterans for central office hearings. We confirmed with the Hearings Management Branch that all Central Office appeals to be scheduled area already available in Location 57, which is already part of their normal processes for scheduling CO hearings. 
 
-The Project Management Team will develop training materials and we will schedule a training with the CO Hearing Coordinator.
+The Project Management Team will develop training materials and we will schedule a training with the CO Hearing Coordinator. 
 
-**One Regional Office** — After successful rollout to Central Office hearings, the board will take over slotting veterans for 1 RO that does not have any alternate hearing locations through Caseflow. For this to work, the Board will need to activate, case review, and move these appeals to Location 57 so that Caseflow can display those Veterans to schedule.
+**One Regional Office** — After successful rollout to Central Office hearings, the board will take over slotting veterans for 1 RO that does not have any alternate hearing locations through Caseflow. For this to work, the Board will need to activate, case review, and move these appeals to Location 57 so that Caseflow can display those Veterans to schedule.  
 
-**Full Roll out** - On February 14th, 2019, the board will take over slotting veterans for all ROs.  The Board will need to have appeals that are ready to be scheduled activated, reviewed, and in location 57.
+**Full Roll out** - On February 14th, 2019, the board will take over slotting veterans for all ROs.  The Board will need to have appeals that are ready to be scheduled activated, reviewed, and in location 57. 
 
 ## Research Notes
diff --git a/docs/tech-specs/2018-11-14-schedule-hearing-task.md b/docs/tech-specs/2018-11-14-schedule-hearing-task.md
index fe2639c8738..5b742f0c752 100644
--- a/docs/tech-specs/2018-11-14-schedule-hearing-task.md
+++ b/docs/tech-specs/2018-11-14-schedule-hearing-task.md
@@ -1,14 +1,14 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/ScheduleHearingTask.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/ScheduleHearingTask.md).
 
 ## Schedule Hearing Task
 
-Owner: Sharon Warner & Andrew Lomax
-Date: 2018-11-14
+Owner: Sharon Warner & Andrew Lomax   
+Date: 2018-11-14   
 Reviewers: Lowell Wood
 
 ## Context
 
-We are refactoring the way we create Hearing Scheduling tasks on the Case Details page!
+We are refactoring the way we create Hearing Scheduling tasks on the Case Details page! 
 
 Previously, we created a Schedule Hearing task anytime a user navigated to the Case Details page from the Assign Hearings page. Unfortunately this leaves out necessary functionality; for example, sometimes users will navigate to the Case Details page from search and need to schedule a hearing.
 
@@ -16,7 +16,7 @@ To fix this, we are now going to allow Hearings Management Branch users to creat
 
 ## Overview
 
-When on the Case Details page, all Hearings Management Branch users will have the ability to create a Schedule Hearing task for the appeal as long as 1) The appeal does not already have a hearing with no disposition, and 2) The appeal does not already have an open Schedule Hearing task.
+When on the Case Details page, all Hearings Management Branch users will have the ability to create a Schedule Hearing task for the appeal as long as 1) The appeal does not already have a hearing with no disposition, and 2) The appeal does not already have an open Schedule Hearing task. 
 
 When a user begins working on the Schedule Hearing task, a modal is displayed. This modal will display a noneditable hearing location (Central Office or the RO for a video hearing) and dropdown of upcoming hearing dates with available slots for that hearing location. If the user has navigated to the Case Details page from the Assign Hearings page, the hearing date will be prepopulated with the date the user selected on the Assign Hearings page. If the user has navigated to the Case Details page a different way, the date will not be prepopulated.
 
diff --git a/docs/tech-specs/2018-11-16-co-parent-records-transition.md b/docs/tech-specs/2018-11-16-co-parent-records-transition.md
index b831702044b..f173a4d07aa 100644
--- a/docs/tech-specs/2018-11-16-co-parent-records-transition.md
+++ b/docs/tech-specs/2018-11-16-co-parent-records-transition.md
@@ -1,11 +1,11 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/COParentRecordsTransition.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/COParentRecordsTransition.md).
 
-## CO Parent Records to Caseflow
+## CO Parent Records to Caseflow  
 
-Owner: Sharon Warner
+Owner: Sharon Warner  
 Date: 2018-11-16
-Reviewer(s): Oscar Ramirez, Meredith Stewart, & Andrew Lomax
-Review by:  2018-11-18
+Reviewer(s): Oscar Ramirez, Meredith Stewart, & Andrew Lomax  
+Review by:  2018-11-18 
 
 ## Context
 
diff --git a/docs/tech-specs/2018-11-28-legacy-issue-establishment.md b/docs/tech-specs/2018-11-28-legacy-issue-establishment.md
index f1adcc74693..3eabcaf036d 100644
--- a/docs/tech-specs/2018-11-28-legacy-issue-establishment.md
+++ b/docs/tech-specs/2018-11-28-legacy-issue-establishment.md
@@ -1,4 +1,4 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/legacy-issue-establishment.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/legacy-issue-establishment.md).
 
 # Legacy Issue Optin
 
@@ -37,9 +37,9 @@ Example schema:
 -------------------------------+-----------------------------+-----------+-------------------------------
  id                            | bigint                      |  not null | autoincrement
  request_issue_id              | bigint                      |  not null |
- submitted_at                  | timestamp without time zone |           |
- attempted_at                  | timestamp without time zone |           |
- processed_at                  | timestamp without time zone |           |
+ submitted_at                  | timestamp without time zone |           | 
+ attempted_at                  | timestamp without time zone |           | 
+ processed_at                  | timestamp without time zone |           | 
  error                         | character varying           |           |
 ```
 
diff --git a/docs/tech-specs/2018-11-30-alternate-hearing-locations.md b/docs/tech-specs/2018-11-30-alternate-hearing-locations.md
index 257c277de8d..9df595e4af0 100644
--- a/docs/tech-specs/2018-11-30-alternate-hearing-locations.md
+++ b/docs/tech-specs/2018-11-30-alternate-hearing-locations.md
@@ -1,10 +1,10 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/AlternateHearingLocations.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/AlternateHearingLocations.md).
 
 ## Alternate Hearing Locations
 
-Owner: Andrew Lomax
-Date: 2018-11-30
-Reviewer(s): Sharon Warner
+Owner: Andrew Lomax  
+Date: 2018-11-30  
+Reviewer(s): Sharon Warner  
 Review by: 2018-11-30
 
 ## Context
@@ -17,7 +17,7 @@ We have compiled a list of all alternate hearing locations for each RO and need
   - Assign Hearings page
 
 ## Overview
-[Research](https://github.com/department-of-veterans-affairs/caseflow/issues/7507)
+[Research](https://github.com/department-of-veterans-affairs/caseflow/issues/7507)  
 [Facility Locator API](https://github.com/department-of-veterans-affairs/caseflow/issues/7545)
 
 #### Necessary data
diff --git a/docs/tech-specs/2018-12-06-legacy-issue-optin-and-rollback.md b/docs/tech-specs/2018-12-06-legacy-issue-optin-and-rollback.md
index e18b7a79611..4f764d86b51 100644
--- a/docs/tech-specs/2018-12-06-legacy-issue-optin-and-rollback.md
+++ b/docs/tech-specs/2018-12-06-legacy-issue-optin-and-rollback.md
@@ -1,4 +1,4 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/legacy-issue-optin-and-rollback.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/legacy-issue-optin-and-rollback.md).
 
 # Legacy issue opt-in and rollback
 
@@ -25,7 +25,7 @@ This requires overwriting the existing disposition.
 We still need to determine how to approach remanded issues.  Here are three proposals.
 
 ### 1
-Create a different follow up post-remand appeal for each issue closed (one appeal for each issue).  Store which post-remand appeal gets created for each issue.
+Create a different follow up post-remand appeal for each issue closed (one appeal for each issue).  Store which post-remand appeal gets created for each issue.  
 
 If all of the issues on the appeal are closed, close the appeal.  This would mean that all of the issues on the appeal are closed, or if the issue has a disposition of "3", then it is associated with a post-remand appeal.
 
diff --git a/docs/tech-specs/2019-01-28-hearing-task-flow.md b/docs/tech-specs/2019-01-28-hearing-task-flow.md
index c02ddbcc86d..e3c3bfe7743 100644
--- a/docs/tech-specs/2019-01-28-hearing-task-flow.md
+++ b/docs/tech-specs/2019-01-28-hearing-task-flow.md
@@ -1,11 +1,11 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingTaskFlow.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingTaskFlow.md).
 
 ## Hearing Task Flow
 
-Owner: Sharon Warner
-Date: 2019-01-28
-Reviewer(s):
-Review by:
+Owner: Sharon Warner  
+Date: 2019-01-28  
+Reviewer(s):   
+Review by:   
 
 ## Task Hierarchy
 ![](2019-01-28-hearing-task-flow.png)
@@ -71,26 +71,26 @@ Review by:
 
 While most of the hearings associated tasks can be completed through the queue framework, the disposition task can only be completed through either the hearing prep daily docket or the hearing schedule daily docket. Because users may not understand the consequences of selecting dispositions on these pages, we will put safeguards in place to ensure we're not unnecessarily creating and deleting tasks.
 
-***Disposition Job***
+***Disposition Job***  
 When a user marks a hearing as canceled, no show, or held, we will immediately save the disposition to the hearings table, but we will not take any task actions to move the appeal forward. The disposition will remain editable in the UI.
 
 We will create an overnight job to pull in all appeals with 1) open DispositionTasks that are not on hold, and 2) a hearing with a disposition that was not held that day (hearing coordinators and judges regularly update dispositions the day after a hearing was schedule). This job will perform the necessary actions described above to move appeals forward.
 
-***Postponed Hearings***
+***Postponed Hearings***  
 When a user marks a hearing as postponed, we will both mark the hearing as postponed in the database and immediately create the necessary tasks to move the appeal forward. We are differentiating this case because postponing a hearing can require immediate action on the resulting tasks from the hearings management branch.
 
-***UI***
+***UI***  
 The hearing prep and hearing schedule daily dockets will be updated such that the hearing dispositions are only editable if either 1) the appeal's DispositionTask is open and not on hold or 2) the appeal does not have a DispositionTask (legacy hearings scheduled prior to 2/1). We will also remove the autosave feature from the hearing prep daily docket and implement a save button.
 
 ## VACOLS Locations for Legacy Appeals
 
-***Appeals in Location 57***
+***Appeals in Location 57***  
 We will run a job to continuously move appeals from location 57 to Caseflow. There should never be any appeal in location 57 that 1) has requested a video or CO hearing and 2) does not have an open hearing, for more than an hour.
 
-***Appeals in Locations 36/38***
+***Appeals in Locations 36/38***  
 The hearings management branch will need to move appeals out of locations 36 and 38 as their associated hearings are held. We will no longer be putting appeals in these locations.
 
-***Appeals in Location 'Caseflow'***
+***Appeals in Location 'Caseflow'***  
 We will add alerts in Looker to ensure that appeals do not get lost in Caseflow. The ticket for this is [here](https://github.com/department-of-veterans-affairs/caseflow/issues/8992).
 
 ## Open Questions
diff --git a/docs/tech-specs/2019-04-11-hearing-prep-merge.md b/docs/tech-specs/2019-04-11-hearing-prep-merge.md
index 85bb75f47b3..2f37b48db0a 100644
--- a/docs/tech-specs/2019-04-11-hearing-prep-merge.md
+++ b/docs/tech-specs/2019-04-11-hearing-prep-merge.md
@@ -1,15 +1,15 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingPrepMerge.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Hearing%20Schedule/Tech%20Specs/HearingPrepMerge.md).
 
 ## Hearing Prep Merge
 
-Owner: Sharon Warner
-Date: 2019-04-11
-Reviewer(s):
-Review by:
+Owner: Sharon Warner  
+Date: 2019-04-11  
+Reviewer(s):   
+Review by:   
 
 ## Context
 
-When Caseflow Hearing Prep was first developed 2 years ago, hearings' master records (records that group hearings by type, date, regional office, and judge) were stored in inconsistent ways in VACOLS. Video hearings were all linked to master records in the hearings table; CO hearings did not have any concept of master records; and travel board hearings had master records stored in a completely different table. Because these master records were so inconsistent, we determined it would be easier to not use master records within hearing prep and instead group hearings in our own way.
+When Caseflow Hearing Prep was first developed 2 years ago, hearings' master records (records that group hearings by type, date, regional office, and judge) were stored in inconsistent ways in VACOLS. Video hearings were all linked to master records in the hearings table; CO hearings did not have any concept of master records; and travel board hearings had master records stored in a completely different table. Because these master records were so inconsistent, we determined it would be easier to not use master records within hearing prep and instead group hearings in our own way. 
 
 Since Caseflow Hearing Schedule's rollout, however, we now have a consistent implementation of master records, now called hearing days, stored in caseflow's database. We also already have implemented hearing schedule views and daily dockets based on these hearing days. In order to minimize discrepancies between Hearing Prep and Hearing Schedule, we are merging Hearing Prep's hearing schedule views and daily dockets into Hearing Schedule.
 
diff --git a/docs/tech-specs/2019-08-01-establish-930-corrections.md b/docs/tech-specs/2019-08-01-establish-930-corrections.md
index 68ef514587f..8168a6c29c8 100644
--- a/docs/tech-specs/2019-08-01-establish-930-corrections.md
+++ b/docs/tech-specs/2019-08-01-establish-930-corrections.md
@@ -1,4 +1,4 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/establish-930-corrections.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Intake/Tech%20Specs/establish-930-corrections.md).
 
 # Creating 930 corrections for request issues with decision issues
 **Notes:**
diff --git a/docs/tech-specs/2019-10-10-integrating-caseflow-with-pexip.md b/docs/tech-specs/2019-10-10-integrating-caseflow-with-pexip.md
index 6a6d2ed20db..af789e0a6da 100644
--- a/docs/tech-specs/2019-10-10-integrating-caseflow-with-pexip.md
+++ b/docs/tech-specs/2019-10-10-integrating-caseflow-with-pexip.md
@@ -1,4 +1,4 @@
-This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/main/Project%20Folders/Caseflow%20Projects/Hearings/Telehearings/tech-specs/Integrating%20Caseflow%20with%20Pexip.md).
+This document was moved from [appeals-team](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/Project%20Folders/Caseflow%20Projects/Hearings/Telehearings/tech-specs/Integrating%20Caseflow%20with%20Pexip.md).
 
 # Integration with Pexip for Virtual Hearings
 
@@ -15,7 +15,7 @@ There is an additional component to email the participants of the conference tha
   - [Epic](https://app.zenhub.com/workspaces/caseflow-5915dd178f67e20b5553ba0c/issues/department-of-veterans-affairs/caseflow/11132)
   - [Tech Spec](https://app.zenhub.com/workspace/o/department-of-veterans-affairs/caseflow/issues/12012)
   - [Implementation](https://app.zenhub.com/workspace/o/department-of-veterans-affairs/caseflow/issues/11730)
-
+  
 ### Resources
 
   - [Pexip homepage](https://www.pexip.com)
@@ -26,7 +26,7 @@ There is an additional component to email the participants of the conference tha
   - [Pexip browser support](https://docs.pexip.com/admin/interoperability.htm)
   - [Slack Thread on Deployment](https://dsva.slack.com/archives/CAM9FJ85P/p1570459327417500)
   - [Mapping Host to IP](https://github.com/department-of-veterans-affairs/appeals-deployment/blob/2b67911264124e41e887cf810f735c0d1eb8c493/ansible/vars/va-services.yml)
-
+  
 ## Overview
 
 To support the BVA's video conferencing initiative, Caseflow will need to be able to manage Pexip conferences from creation to deletion using the Pexip API.
@@ -348,7 +348,7 @@ Where:
 
 The URL must always include `https://<address>/webapp/?` But the remainder of the fields are optional. If a field is not specified in the URL, the user joining the conference will be asked to fill in the appropriate fields in a form before joining the conference.
 
-We can pre-fill some or all of these fields and allow participants the participants to review and make changes before joining or we can format the URL so that the participants are taken straight into the conference. The latter is preferable as we will display a link on the hearing docket for judges and send emails containing the URL with detailed instructions to all participants.
+We can pre-fill some or all of these fields and allow participants the participants to review and make changes before joining or we can format the URL so that the participants are taken straight into the conference. The latter is preferable as we will display a link on the hearing docket for judges and send emails containing the URL with detailed instructions to all participants. 
 
 ### Deleting Conferences for Past Hearings
 
diff --git a/docs/tech-specs/README.md b/docs/tech-specs/README.md
index cad1a687571..3d9efc8e903 100644
--- a/docs/tech-specs/README.md
+++ b/docs/tech-specs/README.md
@@ -17,8 +17,8 @@ This folder contains tech specs for the Caseflow team.
 
 ## In order to write a tech spec and get it reviewed do the following:
 1. Clone this repo
-2. Start drafting a tech spec by opening a PR creating a file titled YYYY-MM-DD-(tech-spec-name).md in this folder with your tech spec. You can use the [tech spec template here](https://github.com/department-of-veterans-affairs/caseflow/blob/main/.github/ISSUE_TEMPLATE/tech-spec.md)
+2. Start drafting a tech spec by opening a PR creating a file titled YYYY-MM-DD-(tech-spec-name).md in this folder with your tech spec. You can use the [tech spec template here](https://github.com/department-of-veterans-affairs/caseflow/blob/master/.github/ISSUE_TEMPLATE/tech-spec.md)
 3. Post in #appeals-development and request for others to review the tech spec
 4. Schedule time on the VA Appeals calendar with your scrum team or the whole Caseflow engineering team as appropriate to discuss the tech spec
-5. Once comments are addressed, the tech spec is finalized and your PR is approved, merge your commit to main so that the tech spec is preserved for future team mates
+5. Once comments are addressed, the tech spec is finalized and your PR is approved, merge your commit to master so that the tech spec is preserved for future team mates
 6. Link your tech spec in future PRs that implement the changes
diff --git a/lib/helpers/scripts/missing_vacols_hearing_job_fix.sh b/lib/helpers/scripts/missing_vacols_hearing_job_fix.sh
deleted file mode 100644
index 211908d47a9..00000000000
--- a/lib/helpers/scripts/missing_vacols_hearing_job_fix.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-cd /opt/caseflow-certification/src; bin/rails c << DONETOKEN
-x = MissingVacolsHearingJobFix.new
-x.perform
-DONETOKEN
diff --git a/package.json b/package.json
new file mode 100644
index 00000000000..e361aad526b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "node": "16.16.0"
+  }
+}
diff --git a/scripts/dev_env_setup_step1.sh b/scripts/dev_env_setup_step1.sh
index d49852d6f45..e29b26b96da 100755
--- a/scripts/dev_env_setup_step1.sh
+++ b/scripts/dev_env_setup_step1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script automates the Developer Setup described here:
-# https://github.com/department-of-veterans-affairs/caseflow/blob/main/README.md#developer-setup
+# https://github.com/department-of-veterans-affairs/caseflow/blob/master/README.md#developer-setup
 
 # It is okay to run this script multiple times.
 # Only Mac has been tested.
diff --git a/scripts/dev_env_setup_step2.sh b/scripts/dev_env_setup_step2.sh
index d8698878fb2..7df7a9dab77 100755
--- a/scripts/dev_env_setup_step2.sh
+++ b/scripts/dev_env_setup_step2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Continuation of Developer Setup at
-# https://github.com/department-of-veterans-affairs/caseflow/blob/main/README.md#install-ruby-dependencies
+# https://github.com/department-of-veterans-affairs/caseflow/blob/master/README.md#install-ruby-dependencies
 
 function detectVersion(){
 	# https://stackoverflow.com/questions/3466166/how-to-check-if-running-in-cygwin-mac-or-linux
@@ -50,5 +50,5 @@ Congratulations
 "
 
 echo 'Finish the manual set up from "Database environment setup":
-   https://github.com/department-of-veterans-affairs/caseflow/blob/main/README.md#database-environment-setup
+   https://github.com/department-of-veterans-affairs/caseflow/blob/master/README.md#database-environment-setup
 '
diff --git a/scripts/whats-next b/scripts/whats-next
index e3532c4cbef..ac930ab72e3 100755
--- a/scripts/whats-next
+++ b/scripts/whats-next
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 LATEST_DEPLOY_TAG=`git tag --list 'deployed/*' | sort -r | head -1`
-git log --pretty=format:"%h%x09%an%x09%x09%s" $LATEST_DEPLOY_TAG...main
+git log --pretty=format:"%h%x09%an%x09%x09%s" $LATEST_DEPLOY_TAG...master
diff --git a/spec/controllers/decision_reviews_controller_spec.rb b/spec/controllers/decision_reviews_controller_spec.rb
index 911bad2b8a4..4280faa4987 100644
--- a/spec/controllers/decision_reviews_controller_spec.rb
+++ b/spec/controllers/decision_reviews_controller_spec.rb
@@ -79,7 +79,7 @@
         expect(response.status).to eq 200
         expect(response.headers["Content-Type"]).to include "text/csv"
         expect(response.body).to start_with("business_line")
-        expect(response.body.match?(task.appeal.class.review_title)).to eq true
+        expect(response.body.match?(task.appeal_type)).to eq true
       end
     end
   end
@@ -306,23 +306,6 @@
       end
     end
 
-    let!(:in_progress_remand_tasks) do
-      (0...10).map do |task_num|
-        task = create(
-          :remand_task,
-          assigned_to: non_comp_org,
-          assigned_at: task_num.minutes.ago + 1.minute.ago
-        )
-        task.appeal.update!(veteran_file_number: veteran.file_number)
-        create(:request_issue, :nonrating, decision_review: task.appeal, benefit_type: non_comp_org.url)
-
-        # Generate some random request issues for testing issue type filters
-        generate_request_issues(task, non_comp_org)
-
-        task
-      end
-    end
-
     let!(:completed_hlr_tasks) do
       (1..20).map do |task_num|
         task = create(
@@ -369,29 +352,6 @@
       end
     end
 
-    let!(:completed_remand_tasks) do
-      (1..10).map do |task_num|
-        task = create(
-          :remand_task,
-          assigned_to: non_comp_org,
-          assigned_at: task_num.days.ago,
-          closed_at: (2 * task_num).hours.ago
-        )
-        task.completed!
-        # Explicitly set the closed_at time again to try to avoid test flakiness
-        task.closed_at = Time.zone.now - (2 * task_num).hours
-        task.appeal.update!(veteran_file_number: veteran.file_number)
-        create(:request_issue, :nonrating, decision_review: task.appeal, benefit_type: non_comp_org.url)
-
-        # Generate some random request issues for testing issue type filters
-        generate_request_issues(task, non_comp_org)
-
-        task.save
-        # Attempt to reload after save to avoid potential test flakiness
-        task.reload
-      end
-    end
-
     before { non_comp_org.add_user(user) }
 
     subject { get :index, params: query_params, format: :json }
@@ -430,23 +390,6 @@
           end
         ).to be true
       end
-
-      it "Only Remand Tasks are shown when filtered" do
-        get :index,
-            params: query_params.merge(
-              filter: ["col=decisionReviewType&val=Remand"],
-              page: 1
-            ),
-            format: :json
-
-        response_body = JSON.parse(response.body)
-
-        expect(
-          response_body["tasks"]["data"].all? do |task|
-            task["type"] == "decision_review_task" && task["attributes"]["type"] == "Remand"
-          end
-        ).to be true
-      end
     end
 
     shared_examples "issue type query filtering" do
@@ -495,9 +438,7 @@
         }
       end
 
-      let(:in_progress_tasks) do
-        in_progress_hlr_tasks + on_hold_hlr_tasks + in_progress_sc_tasks + in_progress_remand_tasks
-      end
+      let(:in_progress_tasks) { in_progress_hlr_tasks + on_hold_hlr_tasks + in_progress_sc_tasks }
 
       include_examples "task query filtering"
       include_examples "issue type query filtering"
@@ -510,30 +451,30 @@
         expect(response.status).to eq(200)
         response_body = JSON.parse(response.body)
 
-        expect(response_body["total_task_count"]).to eq 94
+        expect(response_body["total_task_count"]).to eq 84
         expect(response_body["tasks_per_page"]).to eq 15
-        expect(response_body["task_page_count"]).to eq 7
+        expect(response_body["task_page_count"]).to eq 6
 
         expect(
           task_ids_from_response_body(response_body)
         ).to match_array task_ids_from_seed(in_progress_tasks, (0...15), :assigned_at)
       end
 
-      it "page 7 displays last 4 tasks" do
-        query_params[:page] = 7
+      it "page 6 displays last 9 tasks" do
+        query_params[:page] = 6
 
         subject
 
         expect(response.status).to eq(200)
         response_body = JSON.parse(response.body)
 
-        expect(response_body["total_task_count"]).to eq 94
+        expect(response_body["total_task_count"]).to eq 84
         expect(response_body["tasks_per_page"]).to eq 15
-        expect(response_body["task_page_count"]).to eq 7
+        expect(response_body["task_page_count"]).to eq 6
 
         expect(
           task_ids_from_response_body(response_body)
-        ).to match_array task_ids_from_seed(in_progress_tasks, (-4..in_progress_tasks.size), :assigned_at)
+        ).to match_array task_ids_from_seed(in_progress_tasks, (-9..in_progress_tasks.size), :assigned_at)
       end
     end
 
@@ -545,7 +486,7 @@
         }
       end
 
-      let(:completed_tasks) { completed_sc_tasks + completed_hlr_tasks + completed_remand_tasks }
+      let(:completed_tasks) { completed_sc_tasks + completed_hlr_tasks }
 
       include_examples "task query filtering"
       include_examples "issue type query filtering"
@@ -558,34 +499,34 @@
         expect(response.status).to eq(200)
         response_body = JSON.parse(response.body)
 
-        expect(response_body["total_task_count"]).to eq 50
+        expect(response_body["total_task_count"]).to eq 40
         expect(response_body["tasks_per_page"]).to eq 15
-        expect(response_body["task_page_count"]).to eq 4
+        expect(response_body["task_page_count"]).to eq 3
 
         expect(
           task_ids_from_response_body(response_body)
         ).to match_array task_ids_from_seed(completed_tasks, (0...15), :closed_at)
       end
 
-      it "page 4 displays last 5 tasks" do
-        query_params[:page] = 4
+      it "page 3 displays last 10 tasks" do
+        query_params[:page] = 3
 
         subject
 
         expect(response.status).to eq(200)
         response_body = JSON.parse(response.body)
 
-        expect(response_body["total_task_count"]).to eq 50
+        expect(response_body["total_task_count"]).to eq 40
         expect(response_body["tasks_per_page"]).to eq 15
-        expect(response_body["task_page_count"]).to eq 4
+        expect(response_body["task_page_count"]).to eq 3
 
         expect(
           task_ids_from_response_body(response_body)
-        ).to match_array task_ids_from_seed(completed_tasks, (-5..completed_tasks.size), :closed_at)
+        ).to match_array task_ids_from_seed(completed_tasks, (-10..completed_tasks.size), :closed_at)
       end
     end
 
-    context "vha org with incomplete tasks" do
+    context "vha org incomplete_tasks" do
       let(:non_comp_org) { VhaBusinessLine.singleton }
 
       context "incomplete_tasks" do
@@ -663,7 +604,7 @@
         end
 
         # The Vha Businessline in_progress should not include on_hold since it uses active for the tasks query
-        let(:in_progress_tasks) { in_progress_hlr_tasks + in_progress_sc_tasks + in_progress_remand_tasks }
+        let(:in_progress_tasks) { in_progress_hlr_tasks + in_progress_sc_tasks }
 
         it "page 1 displays first 15 tasks" do
           query_params[:page] = 1
@@ -673,7 +614,7 @@
           expect(response.status).to eq(200)
           response_body = JSON.parse(response.body)
 
-          expect(response_body["total_task_count"]).to eq 74
+          expect(response_body["total_task_count"]).to eq 64
           expect(response_body["tasks_per_page"]).to eq 15
           expect(response_body["task_page_count"]).to eq 5
 
@@ -880,52 +821,11 @@
         end
 
         let!(:task_event) do
-          create(:issue_modification_request,
-                 :with_higher_level_review_with_decision,
-                 :edit_of_request,
-                 :update_decider,
-                 :with_request_issue,
-                 nonrating_issue_category: "Medical and Dental Care Reimbursement")
-        end
-
-        let!(:issue_modification_request_modification) do
-          create(:issue_modification_request,
-                 :with_request_issue,
-                 request_type: "modification",
-                 decision_review: task_event.decision_review)
-        end
-
-        let!(:issue_modification_request_withdrawal) do
-          create(:issue_modification_request,
-                 :with_request_issue,
-                 :withdrawal,
-                 decision_review: task_event.decision_review)
-        end
-
-        let!(:issue_modification_request_removal) do
-          create(:issue_modification_request,
-                 :with_request_issue,
-                 request_type: "removal",
-                 decision_review: task_event.decision_review)
-        end
-        let!(:issue_modification_request_cancel) do
-          create(:issue_modification_request,
-                 :cancel_of_request,
-                 decision_review: task_event.decision_review)
-        end
-
-        let(:task_id) { task_event.decision_review.tasks.ids[0] }
-
-        let!(:remand_task_event) do
-          create(:remand_vha_task)
-        end
-
-        let!(:remand_task_event) do
-          create(:remand_vha_task)
+          create(:higher_level_review_vha_task_with_decision)
         end
 
         it "should return task details" do
-          get :history, params: { task_id: task_id, decision_review_business_line_slug: vha_org.url },
+          get :history, params: { task_id: task_event.id, decision_review_business_line_slug: vha_org.url },
                         format: :json
 
           expect(response.status).to eq 200
@@ -933,57 +833,11 @@
           res = JSON.parse(response.body)
 
           expected_events = [
-            { "taskID" => task_id, "eventType" => "added_issue", "claimType" => "Higher-Level Review",
+            { "taskID" => task_event.id, "eventType" => "added_issue", "claimType" => "Higher-Level Review",
               "readableEventType" => "Added issue" },
             { "eventType" => "claim_creation", "readableEventType" => "Claim created" },
             { "eventType" => "in_progress", "readableEventType" => "Claim status - In progress" },
-            { "eventType" => "completed_disposition", "readableEventType" => "Completed disposition" },
-            { "eventType" => "addition", "readableEventType" => "Requested issue addition" },
-            { "eventType" => "pending", "readableEventType" => "Claim status - Pending" },
-            { "eventType" => "request_approved", "readableEventType" => "Approval of request - issue addition" },
-            { "eventType" => "request_edited", "readableEventType" => "Edit of request - issue addition" },
-            { "eventType" => "modification", "readableEventType" => "Requested issue modification" },
-            { "eventType" => "removal", "readableEventType" => "Requested issue removal" },
-            { "eventType" => "request_cancelled", "readableEventType" => "Cancellation of request" },
-            { "eventType" => "withdrawal", "readableEventType" => "Requested issue withdrawal" }
-          ]
-
-          expected_events.each do |expected_attributes|
-            expect(res).to include(
-              a_hash_including("attributes" => a_hash_including(expected_attributes))
-            )
-          end
-        end
-
-        it "should return remand task details" do
-          get :history, params: { task_id: remand_task_event.id, decision_review_business_line_slug: vha_org.url },
-                        format: :json
-
-          expect(response.status).to eq 200
-
-          res = JSON.parse(response.body)
-
-          expected_events = [
-            { "taskID" => remand_task_event.id, "eventType" => "added_issue", "claimType" => "Remand" }
-          ]
-
-          expected_events.each do |expected_attributes|
-            expect(res).to include(
-              a_hash_including("attributes" => a_hash_including(expected_attributes))
-            )
-          end
-        end
-
-        it "should return remand task details" do
-          get :history, params: { task_id: remand_task_event.id, decision_review_business_line_slug: vha_org.url },
-                        format: :json
-
-          expect(response.status).to eq 200
-
-          res = JSON.parse(response.body)
-
-          expected_events = [
-            { "taskID" => remand_task_event.id, "eventType" => "added_issue", "claimType" => "Remand" }
+            { "eventType" => "completed_disposition", "readableEventType" => "Completed disposition" }
           ]
 
           expected_events.each do |expected_attributes|
diff --git a/spec/factories/appeal.rb b/spec/factories/appeal.rb
index e26ccc43b7c..c73c2424981 100644
--- a/spec/factories/appeal.rb
+++ b/spec/factories/appeal.rb
@@ -686,7 +686,7 @@
         create(:request_issue,
                benefit_type: "vha",
                nonrating_issue_category: "Caregiver | Other",
-               nonrating_issue_description: "VHA - Caregiver",
+               nonrating_issue_description: "VHA - Caregiver ",
                decision_review: appeal,
                decision_date: 1.month.ago)
         appeal.reload
diff --git a/spec/factories/higher_level_review.rb b/spec/factories/higher_level_review.rb
index 8880a175a42..612fdafeab7 100644
--- a/spec/factories/higher_level_review.rb
+++ b/spec/factories/higher_level_review.rb
@@ -167,7 +167,7 @@
         create(:request_issue,
                benefit_type: "vha",
                nonrating_issue_category: "Caregiver | Other",
-               nonrating_issue_description: "VHA - Caregiver",
+               nonrating_issue_description: "VHA - Caregiver ",
                decision_review: higher_level_review,
                decision_date: 1.month.ago)
 
diff --git a/spec/factories/issue_modification_request.rb b/spec/factories/issue_modification_request.rb
index 48fb4d8cb12..17ea37cbafc 100644
--- a/spec/factories/issue_modification_request.rb
+++ b/spec/factories/issue_modification_request.rb
@@ -6,8 +6,7 @@
     request_reason { Faker::Lorem.sentence }
 
     benefit_type { "vha" }
-    nonrating_issue_description { Faker::Lorem.sentence }
-    nonrating_issue_category { Constants::ISSUE_CATEGORIES["vha"].sample }
+    nonrating_issue_category {}
     status { "assigned" }
 
     decision_date { Time.zone.today - rand(0..29) }
@@ -16,36 +15,14 @@
     remove_original_issue { false }
     requestor_id { create(:user).id }
 
-    trait :withdrawal do
-      request_type { "withdrawal" }
-      withdrawal_date { Time.zone.today - rand(0..29) }
-    end
-
     trait :update_decider do
       after(:create) do |imr, evaluator|
-        imr.status = evaluator.status == "assigned" ? "approved" : evaluator.status
+        imr.status = evaluator.status || "approved"
         imr.decider_id = create(:user).id
         imr.save!
       end
     end
 
-    trait :edit_of_request do
-      after(:create) do |imr, evaluator|
-        imr.request_reason = "I edited this request."
-        imr.nonrating_issue_category = evaluator.nonrating_issue_category ||
-                                       Constants::ISSUE_CATEGORIES[evaluator.benefit_type].sample
-        imr.status = evaluator.status
-        imr.save!
-      end
-    end
-
-    trait :cancel_of_request do
-      after(:create) do |imr|
-        imr.status = "cancelled"
-        imr.save!
-      end
-    end
-
     trait :with_request_issue do
       request_issue do
         create(:request_issue,
@@ -70,7 +47,6 @@
     trait :with_supplemental_claim do
       decision_review do
         create(:supplemental_claim,
-               :with_intake,
                :with_vha_issue,
                :update_assigned_at,
                :processed,
@@ -81,21 +57,8 @@
     trait :with_higher_level_review do
       decision_review do
         create(:higher_level_review,
-               :with_intake,
-               :with_vha_issue,
-               :update_assigned_at,
-               :processed,
-               claimant_type: :veteran_claimant)
-      end
-    end
-
-    trait :with_higher_level_review_with_decision do
-      decision_review do
-        create(:higher_level_review,
-               :with_intake,
                :with_vha_issue,
                :update_assigned_at,
-               :with_decision,
                :processed,
                claimant_type: :veteran_claimant)
       end
diff --git a/spec/factories/supplemental_claim.rb b/spec/factories/supplemental_claim.rb
index 2ed4c7ef5a2..39ed9b6df54 100644
--- a/spec/factories/supplemental_claim.rb
+++ b/spec/factories/supplemental_claim.rb
@@ -282,16 +282,5 @@
                decision_review: sc)
       end
     end
-
-    factory :remand, class: Remand do
-      type { Remand.name }
-      decision_review_remanded do
-        create(
-          :appeal,
-          :with_decision_issue,
-          disposition: "remanded"
-        )
-      end
-    end
   end
 end
diff --git a/spec/factories/task.rb b/spec/factories/task.rb
index bf6787b7f1b..3478613c729 100644
--- a/spec/factories/task.rb
+++ b/spec/factories/task.rb
@@ -431,11 +431,6 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
         assigned_by { nil }
       end
 
-      factory :remand_task, class: DecisionReviewTask do
-        appeal { create(:remand, benefit_type: "nca") }
-        assigned_by { nil }
-      end
-
       factory :supplemental_claim_poa_task, class: DecisionReviewTask do
         appeal do
           create(:supplemental_claim,
@@ -516,19 +511,6 @@ def self.find_first_task_or_create(appeal, task_type, **kwargs)
         assigned_to { VhaBusinessLine.singleton }
       end
 
-      factory :remand_vha_task, class: DecisionReviewTask do
-        appeal do
-          create(
-            :remand,
-            :with_vha_issue,
-            benefit_type: "vha",
-            claimant_type: :veteran_claimant
-          )
-        end
-        assigned_by { nil }
-        assigned_to { VhaBusinessLine.singleton }
-      end
-
       factory :supplemental_claim_vha_task_incomplete, class: DecisionReviewTask do
         appeal do
           create(
diff --git a/spec/feature/intake/supplemental_claim/edit_spec.rb b/spec/feature/intake/supplemental_claim/edit_spec.rb
index 1aa698d7434..3f2df22e705 100644
--- a/spec/feature/intake/supplemental_claim/edit_spec.rb
+++ b/spec/feature/intake/supplemental_claim/edit_spec.rb
@@ -930,25 +930,5 @@ def click_cancel(visit_page)
       safe_click "#decision-date"
       expect(page).to have_button("Add this issue", disabled: true)
     end
-
-    context "with a remand" do
-      let(:remand) { create(:remand_vha_task, assigned_at: 1.minute.ago) }
-
-      before do
-        remand.appeal.establish!
-      end
-
-      let(:edit_url) do
-        "/supplemental_claims/#{remand.appeal.uuid}/edit"
-      end
-
-      it "should not allow editing" do
-        visit edit_url
-
-        expect(page).to have_content(COPY::REMANDS_NOT_EDITABLE)
-        expect(page).not_to have_css(".cf-select__control")
-        expect(page).to have_button("Establish", disabled: true)
-      end
-    end
   end
 end
diff --git a/spec/feature/non_comp/dispositions_spec.rb b/spec/feature/non_comp/dispositions_spec.rb
index 7d270821654..36fb413bc45 100644
--- a/spec/feature/non_comp/dispositions_spec.rb
+++ b/spec/feature/non_comp/dispositions_spec.rb
@@ -502,28 +502,6 @@ def find_disabled_disposition(disposition, description = nil)
         end
       end
     end
-
-    context "viewing a remand" do
-      let(:in_progress_remand_task) do
-        create(:remand_vha_task, assigned_at: 1.minute.ago)
-      end
-
-      let(:dispositions_url) { "#{business_line_url}/tasks/#{in_progress_remand_task.id}" }
-
-      it "should disable the request issue modification button" do
-        visit dispositions_url
-
-        expect(page).to have_css(".usa-button-disabled", text: "Request issue modification")
-        expect(page).to have_content(COPY::REMANDS_NOT_EDITABLE)
-      end
-
-      it "should disable the edit issues button" do
-        User.authenticate!(user: admin_user)
-        visit dispositions_url
-
-        expect(page).to have_css(".usa-button-disabled", text: "Edit Issues")
-      end
-    end
   end
 
   def enable_feature_flag_and_redirect_to_disposition
diff --git a/spec/feature/non_comp/individual_claim_history_spec.rb b/spec/feature/non_comp/individual_claim_history_spec.rb
index a5d01b3b835..f7d5a141752 100644
--- a/spec/feature/non_comp/individual_claim_history_spec.rb
+++ b/spec/feature/non_comp/individual_claim_history_spec.rb
@@ -10,885 +10,27 @@
   let(:non_comp_org) { VhaBusinessLine.singleton }
   let(:user) { create(:default_user, css_id: "REPORT USER", full_name: "Report User") }
   let(:veteran) { create(:veteran) }
+  let!(:task) { create(:higher_level_review_vha_task_with_decision) }
+  let(:task_history_url) { "/decision_reviews/vha/tasks/#{task.id}/history" }
+  let(:events) { ClaimHistoryService.new(non_comp_org, task_id: task.id).build_events }
 
   before do
     User.stub = user
     non_comp_org.add_user(user)
     OrganizationsUser.make_user_admin(user, non_comp_org)
+    visit task_history_url
   end
 
-  def click_filter_option(filter_text)
-    sort = find("[aria-label='Filter by Activity']")
-    sort.click
+  scenario "display the claim history table" do
+    number_of_events = events.length
 
-    dropdown_filter = page.find(class: "cf-dropdown-filter")
-    dropdown_filter.find("label", text: filter_text, match: :prefer_exact).click
-  end
-
-  def clear_filter_option(filter_text)
-    sort = find("[aria-label='Filter by Activity. Filtering by #{filter_text}']")
-    sort.click
-
-    clear_button_filter = page.find(class: "cf-clear-filter-button-wrapper")
-    clear_button_filter.click
-  end
-
-  describe "Check for event hitsoty activity dynamic labels" do
-    let!(:task_event) do
-      create(:issue_modification_request,
-             :with_higher_level_review_with_decision,
-             nonrating_issue_category: "Medical and Dental Care Reimbursement")
-    end
-
-    # Edited then approved
-    let!(:issue_modification_request_modification_edit) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       :edit_of_request,
-                       request_type: "modification",
-                       decision_review: task_event.decision_review)
-      request.update(status: "approved")
-      request
-    end
-
-    let!(:issue_modification_request_withdrawal_edit) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       :edit_of_request,
-                       :withdrawal,
-                       decision_review: task_event.decision_review)
-      request.update(status: "approved")
-      request
-    end
-
-    let!(:issue_modification_request_addition_edit) do
-      request = create(:issue_modification_request,
-                       :edit_of_request,
-                       decision_review: task_event.decision_review)
-      request.update(status: "approved")
-      request
-    end
-
-    let!(:issue_modification_request_removal_edit) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       :edit_of_request,
-                       request_type: "removal",
-                       decision_review: task_event.decision_review)
-      request.update(status: "approved")
-      request
-    end
-
-    # cancelled
-    let!(:cancelled_issue_modification_request_modification) do
-      create(:issue_modification_request,
-             :with_request_issue,
-             :cancel_of_request,
-             request_type: "modification",
-             decision_review: task_event.decision_review)
-    end
-
-    let!(:cancelled_issue_modification_request_withdrawal) do
-      create(:issue_modification_request,
-             :with_request_issue,
-             :cancel_of_request,
-             :withdrawal,
-             decision_review: task_event.decision_review)
-    end
-
-    let!(:cancelled_issue_modification_request_addition) do
-      create(:issue_modification_request,
-             :cancel_of_request,
-             decision_review: task_event.decision_review)
-    end
-
-    let!(:cancelled_issue_modification_request_removal) do
-      create(:issue_modification_request,
-             :with_request_issue,
-             :cancel_of_request,
-             request_type: "removal",
-             decision_review: task_event.decision_review)
-    end
-
-    # Rejected aka Denied
-    let!(:denied_issue_modification_request_modification) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       request_type: "modification",
-                       decision_review: task_event.decision_review)
-
-      request.update(
-        status: "denied",
-        decision_reason: "Decision for denial"
-      )
-      request
-    end
-
-    let!(:denied_issue_modification_request_withdrawal) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       :withdrawal,
-                       decision_review: task_event.decision_review)
-
-      request.update(
-        status: "denied",
-        decision_reason: "Decision for denial"
-      )
-      request
-    end
-
-    let!(:denied_issue_modification_request_addition) do
-      request = create(:issue_modification_request,
-                       decision_review: task_event.decision_review)
-
-      request.update(
-        status: "denied",
-        decision_reason: "Decision for denial"
-      )
-      request
-    end
-
-    let!(:denied_issue_modification_request_removal) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       request_type: "removal",
-                       decision_review: task_event.decision_review)
-
-      request.update(
-        status: "denied",
-        decision_reason: "Decision for denial"
-      )
-      request
-    end
-
-    let!(:claim_closed) do
-      create(:higher_level_review_vha_task_with_decision)
-    end
-
-    let(:task_id) { task_event.decision_review.tasks.ids[0] }
-
-    let(:task_history_url) { "/decision_reviews/vha/tasks/#{task_id}/history" }
-    let(:events) { ClaimHistoryService.new(non_comp_org, task_id: task_id).build_events }
-
-    before do
-      visit task_history_url
-    end
-
-    let(:event_types) { events.map(&:readable_event_type).uniq.sort! }
-
-    context "Testing all Event Types" do
-      it "Filtering each event and verifiying row attributes" do
-        step "display the claim history table count" do
-          expect(page).to have_text("Viewing 1-15 of #{events.length} total")
-
-          click_filter_option("Approval of request - issue addition (1)")
-          expect(event_types.include?("Approval of request - issue addition")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Approval of request - issue addition")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Request originated by:")
-
-          expect(table_row).to have_content("View original request")
-          table_row.first("a", text: "View original request").click
-
-          expect(table_row).to have_content("Hide original request")
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Addition request reason:")
-          clear_filter_option("Approval of request - issue addition")
-        end
-
-        step "Checking Approval of request - issue modification" do
-          click_filter_option("Approval of request - issue modification (1)")
-          expect(event_types.include?("Approval of request - issue modification")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Approval of request - issue modification")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Remove original issue:")
-          expect(table_row).to have_content("Request originated by")
-          expect(table_row).to have_content("View original request")
-
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Current issue type:")
-          expect(table_row).to have_content("Current issue description:")
-          expect(table_row).to have_content("Current decision date:")
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("Modification request reason:")
-          clear_filter_option("Approval of request - issue modification")
-        end
-
-        step "Checking Approval of request - issue removal" do
-          click_filter_option("Approval of request - issue removal (1)")
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-          expect(event_types.include?("Approval of request - issue removal")).to be_truthy
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Approval of request - issue removal")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Request originated by")
-          expect(table_row).to have_content("View original request")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Removal request reason:")
-          clear_filter_option("Approval of request - issue removal")
-        end
-
-        step "Checking Approval of request - issue withdrawal" do
-          click_filter_option("Approval of request - issue withdrawal (1)")
-          expect(event_types.include?("Approval of request - issue withdrawal")).to be_truthy
-
-          table = page.find("tbody")
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Approval of request - issue withdrawal")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Request originated by")
-          expect(table_row).to have_content("View original request")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Withdrawal request reason:")
-          expect(table_row).to have_content("Withdrawal request date:")
-          clear_filter_option("Approval of request - issue withdrawal")
-        end
-
-        step "Checking Cancellation of request" do
-          click_filter_option("Cancellation of request")
-          expect(event_types.include?("Cancellation of request")).to be_truthy
-          table = page.find("tbody")
-
-          expect(table).to have_selector("tr", count: 4)
-          clear_filter_option("Cancellation of request")
-        end
-
-        step "Checking Edit of request - issue addition" do
-          click_filter_option("Edit of request - issue addition (1)")
-          expect(event_types.include?("Edit of request - issue addition")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first('tr[id^="table-row"]')
-
-          expect(table_row).to have_content("Edit of request - issue addition")
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("New addition request reason:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Addition request reason:")
-          clear_filter_option("Edit of request - issue addition")
-        end
-
-        step "Checking Edit of request - issue modification" do
-          click_filter_option("Edit of request - issue modification (1)")
-          expect(event_types.include?("Edit of request - issue modification")).to be_truthy
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Edit of request - issue modification")
-
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("New modification request reason:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Current issue type:")
-          expect(table_row).to have_content("Current issue description:")
-          expect(table_row).to have_content("Current decision date:")
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("Modification request reason:")
-
-          clear_filter_option("Edit of request - issue modification")
-        end
-
-        step "Checking Edit of request - issue removal" do
-          click_filter_option("Edit of request - issue removal (4)")
-          expect(event_types.include?("Edit of request - issue removal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 4)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Edit of request - issue removal")
-          expect(table_row).to have_content("New removal request reason:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Removal request reason:")
-          clear_filter_option("Edit of request - issue removal")
-        end
-
-        step "Checking Edit of request - issue withdrawal" do
-          click_filter_option("Edit of request - issue withdrawal (4)")
-          expect(event_types.include?("Edit of request - issue withdrawal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 4)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Edit of request - issue withdrawal")
-          expect(table_row).to have_content("New withdrawal request reason:")
-          expect(table_row).to have_content("New withdrawal request date:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Withdrawal request reason:")
-          expect(table_row).to have_content("Withdrawal request date:")
-          clear_filter_option("Edit of request - issue withdrawal")
-        end
-
-        step "Checking Rejection of request - issue addition" do
-          click_filter_option("Rejection of request - issue addition (1)")
-          expect(event_types.include?("Rejection of request - issue addition")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Reason for rejection:")
-          expect(table_row).to have_content("Request originated by:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Addition request reason:")
-
-          clear_filter_option("Rejection of request - issue addition")
-        end
-
-        step "Checking Rejection of request - issue modification" do
-          click_filter_option("Rejection of request - issue modification (1)")
-          expect(event_types.include?("Rejection of request - issue modification")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Reason for rejection:")
-          expect(table_row).to have_content("Request originated by:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Current issue type:")
-          expect(table_row).to have_content("Current issue description:")
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("Modification request reason:")
-
-          clear_filter_option("Rejection of request - issue modification")
-        end
-
-        step "Checking Rejection of request - issue removal" do
-          click_filter_option("Rejection of request - issue removal (1)")
-          expect(event_types.include?("Rejection of request - issue removal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Reason for rejection:")
-          expect(table_row).to have_content("Request originated by:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Decision date:")
-
-          clear_filter_option("Rejection of request - issue removal")
-        end
-
-        step "Checking Rejection of request - issue withdrawal" do
-          click_filter_option("Rejection of request - issue withdrawal (1)")
-          expect(event_types.include?("Rejection of request - issue withdrawal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Request decision:")
-          expect(table_row).to have_content("Reason for rejection:")
-          expect(table_row).to have_content("Request originated by:")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-
-          expect(table_row).to have_content("Hide original request")
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Withdrawal request reason:")
-          expect(table_row).to have_content("Withdrawal request date:")
-
-          clear_filter_option("Rejection of request - issue withdrawal")
-        end
-
-        step "Checking Added issue" do
-          click_filter_option("Added issue")
-          expect(event_types.include?("Added issue")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 10)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-
-          clear_filter_option("Added issue")
-        end
-
-        step "checking Requested issue addition" do
-          click_filter_option("Requested issue addition (4)")
-          expect(event_types.include?("Requested issue addition")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 4)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Requested issue addition")
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Addition request reason:")
-
-          clear_filter_option("Requested issue addition")
-        end
-
-        step "Checking Requested issue modification" do
-          click_filter_option("Requested issue modification (3)")
-          expect(event_types.include?("Requested issue modification")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 3)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Requested issue modification")
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Current issue type:")
-          expect(table_row).to have_content("Current issue description:")
-          expect(table_row).to have_content("Current decision date:")
-          expect(table_row).to have_content("New issue type:")
-          expect(table_row).to have_content("New issue description:")
-          expect(table_row).to have_content("New decision date:")
-          expect(table_row).to have_content("Modification request reason:")
-
-          clear_filter_option("Requested issue modification")
-        end
-
-        step "Checking Requested issue removal" do
-          click_filter_option("Requested issue removal (3)")
-          expect(event_types.include?("Requested issue removal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 3)
-
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Requested issue removal")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Removal request reason:")
-
-          clear_filter_option("Requested issue removal")
-        end
-
-        step "Checking Requested issue withdrawal" do
-          click_filter_option("Requested issue withdrawal (3)")
-          expect(event_types.include?("Requested issue withdrawal")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 3)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Requested issue withdrawal")
-
-          expect(table_row).to have_content("Benefit type:")
-          expect(table_row).to have_content("Issue type:")
-          expect(table_row).to have_content("Issue description:")
-          expect(table_row).to have_content("Decision date:")
-          expect(table_row).to have_content("Withdrawal request reason:")
-          expect(table_row).to have_content("Withdrawal request date:")
-
-          clear_filter_option("Requested issue withdrawal")
-        end
-
-        step "Checking Claim status - Pending" do
-          click_filter_option("Claim status - Pending (1)")
-          expect(event_types.include?("Claim status - Pending")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Claim status - Pending")
-          expect(table_row).to have_content("Claim cannot be processed until VHA admin reviews pending requests.")
-
-          clear_filter_option("Claim status - Pending")
-        end
-
-        step "Checking Claim created" do
-          click_filter_option("Claim created (1)")
-          expect(event_types.include?("Claim created")).to be_truthy
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-
-          table_row = table.first("tr")
-          expect(table_row).to have_content("Claim created")
-          expect(table_row).to have_content("Claim created.")
-        end
-      end
-    end
-
-    context "should do expected details to show claim close for a claim close" do
-      before { visit "/decision_reviews/vha/tasks/#{claim_closed.id}/history" }
-
-      it "Claim closed" do
-        click_filter_option("Claim closed (1)")
-
-        table = page.find("tbody")
-        expect(table).to have_selector("tr", count: 1)
-
-        table_row = table.first("tr")
-        expect(table_row).to have_content("Claim closed")
-        expect(table_row).to have_content("Claim decision date:")
-      end
-    end
-  end
-
-  describe "check for dynamic data coming in" do
-    let!(:task_event_two) do
-      create(:issue_modification_request,
-             :with_higher_level_review_with_decision,
-             nonrating_issue_category: "Medical and Dental Care Reimbursement")
-    end
-    let(:task_event_two_id) { task_event_two.decision_review.tasks.ids[0] }
-
-    let!(:approved_modification_edit) do
-      create(:issue_modification_request,
-             request_type: "modification",
-             decision_review: task_event_two.decision_review,
-             request_issue: task_event_two.decision_review.request_issues.first,
-             request_reason: "Initial request reason",
-             decision_date: 2.days.ago)
-    end
-
-    let!(:cancelled_issue_modification_request_modification) do
-      create(:issue_modification_request,
-             :with_request_issue,
-             :cancel_of_request,
-             request_type: "modification",
-             decision_review: task_event_two.decision_review)
-    end
-
-    let!(:denied_issue_modification_request_modification) do
-      request = create(:issue_modification_request,
-                       :with_request_issue,
-                       request_type: "modification",
-                       decision_review: task_event_two.decision_review)
-
-      request.update(
-        status: "denied",
-        decision_reason: "Decision for approval"
-      )
-      request
-    end
-
-    let(:events) { ClaimHistoryService.new(non_comp_org, task_id: task_event_two_id).build_events }
-
-    before do
-      Timecop.freeze(Time.zone.now)
-      # approved_modification_edit
-      Timecop.travel(2.minutes.from_now)
-
-      # Edit the request to create a request edit event
-      approved_modification_edit.update!(request_reason: "I edited this request.",
-                                         nonrating_issue_category: "CHAMPVA",
-                                         nonrating_issue_description: "Newly edited issue description")
-
-      Timecop.travel(2.minutes.from_now)
-      approved_modification_edit.update!(status: "approved")
-    end
-
-    after do
-      Timecop.return
-    end
-
-    context "Check for data output" do
-      it "check for the correct data for Edited Request Modification" do
-        visit "/decision_reviews/vha/tasks/#{task_event_two_id}/history"
-        click_filter_option("Edit of request - issue modification (1)")
-
-        original_modification_request = events.detect { |e| e.event_type == :request_edited }
-
-        new_decision_date = original_modification_request.new_decision_date
-        request_issue_decision_date = Date.parse(original_modification_request.decision_date)
-
-        table = page.find("tbody")
-        expect(table).to have_selector("tr", count: 1)
-        table_row = table.first('tr[id^="table-row"]')
-        expect(table_row).to have_content("Edit of request - issue modification")
-        expect(table_row).to have_content("New issue type: #{approved_modification_edit.nonrating_issue_category}")
-        expect(table_row).to have_content(
-          "New issue description: #{approved_modification_edit.nonrating_issue_description}"
-        )
-        expect(table_row).to have_content(
-          "New decision date: #{approved_modification_edit.decision_date.strftime('%m/%d/%Y')}"
-        )
-        expect(table_row).to have_content(
-          "New modification request reason: #{approved_modification_edit.request_reason}"
-        )
-
-        expect(table_row).to have_content("View original request")
-        first("a", text: "View original request").click
-        expect(table_row).to have_content("Hide original request")
-
-        expect(table_row).to have_content("Benefit type: Veterans Health Administration")
-        expect(table_row).to have_content("Current issue type: #{original_modification_request.issue_type}")
-        expect(table_row).to have_content(
-          "Current issue description: #{original_modification_request.issue_description}"
-        )
-        expect(table_row).to have_content(
-          "Current decision date: #{request_issue_decision_date.strftime('%m/%d/%Y')}"
-        )
-        expect(table_row).to have_content("New issue type: #{original_modification_request.new_issue_type}")
-        expect(table_row).to have_content(
-          "New issue description: #{original_modification_request.new_issue_description}"
-        )
-
-        expect(table_row).to have_content("New decision date: #{new_decision_date.strftime('%m/%d/%Y')}")
-        expect(table_row).to have_content(
-          "Modification request reason: #{original_modification_request.previous_modification_request_reason}"
-        )
-
-        clear_filter_option("Edit of request - issue modification")
-
-        step "check for the correct data for Approval of request - issue modification" do
-          click_filter_option("Approval of request - issue modification (1)")
-
-          original_modification_request = events.reverse.find { |e| e.event_type == :request_approved }
-          new_decision_date = Date.parse(original_modification_request.new_decision_date)
-          request_issue_decision_date = Date.parse(original_modification_request.decision_date)
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Approval of request - issue modification")
-
-          expect(table_row).to have_content("Request decision: #{
-            original_modification_request.issue_modification_request_status == 'denied' ? 'Rejected' : 'Approved'
-          }")
-
-          expect(table_row).to have_content("Remove original issue: #{
-            original_modification_request.remove_original_issue ? 'Yes' : 'No'
-          }")
-          expect(table_row).to have_content("Request originated by: #{original_modification_request.requestor}")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type: Veterans Health Administration")
-          expect(table_row).to have_content("Current issue type: #{original_modification_request.issue_type}")
-          expect(table_row).to have_content(
-            "Current issue description: #{original_modification_request.issue_description}"
-          )
-          expect(table_row).to have_content(
-            "Current decision date: #{request_issue_decision_date.strftime('%m/%d/%Y')}"
-          )
-          expect(table_row).to have_content("New issue type: #{original_modification_request.new_issue_type}")
-          expect(table_row).to have_content(
-            "New issue description: #{original_modification_request.new_issue_description}"
-          )
-          expect(table_row).to have_content("New decision date: #{new_decision_date.strftime('%m/%d/%Y')}")
-          expect(table_row).to have_content(
-            "Modification request reason: #{original_modification_request.modification_request_reason}"
-          )
-
-          clear_filter_option("Approval of request - issue modification")
-        end
-
-        step "check for the correct data for denied request modification" do
-          click_filter_option("Rejection of request - issue modification (1)")
-
-          original_modification_request = events.detect { |e| e.event_type == :request_denied }
-          new_decision_date = Date.parse(original_modification_request.new_decision_date)
-          request_issue_decision_date = Date.parse(original_modification_request.decision_date)
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Rejection of request - issue modification")
-
-          expect(table_row).to have_content("Request decision: #{
-            original_modification_request.issue_modification_request_status == 'denied' ? 'Rejected' : 'Approved'
-          }")
-          expect(table_row).to have_content("Request originated by: #{original_modification_request.requestor}")
-
-          expect(table_row).to have_content("View original request")
-          first("a", text: "View original request").click
-          expect(table_row).to have_content("Hide original request")
-
-          expect(table_row).to have_content("Benefit type: Veterans Health Administration")
-          expect(table_row).to have_content("Current issue type: #{original_modification_request.issue_type}")
-          expect(table_row).to have_content(
-            "Current issue description: #{original_modification_request.issue_description}"
-          )
-          expect(table_row).to have_content(
-            "Current decision date: #{request_issue_decision_date.strftime('%m/%d/%Y')}"
-          )
-          expect(table_row).to have_content("New issue type: #{original_modification_request.new_issue_type}")
-          expect(table_row).to have_content(
-            "New issue description: #{original_modification_request.new_issue_description}"
-          )
-          expect(table_row).to have_content("New decision date: #{new_decision_date.strftime('%m/%d/%Y')}")
-          expect(table_row).to have_content(
-            "Modification request reason: #{original_modification_request.modification_request_reason}"
-          )
-
-          clear_filter_option("Rejection of request - issue modification")
-        end
-
-        step "check for the correct data for Cancellation of request" do
-          click_filter_option("Cancellation of request (1)")
-
-          original_modification_request = events.detect { |e| e.event_type == :request_cancelled }
-
-          new_decision_date = Date.parse(original_modification_request.new_decision_date)
-          request_issue_decision_date = Date.parse(original_modification_request.decision_date)
-
-          table = page.find("tbody")
-          expect(table).to have_selector("tr", count: 1)
-          table_row = table.first('tr[id^="table-row"]')
-          expect(table_row).to have_content("Cancellation of request")
-
-          expect(table_row).to have_content("Benefit type: Veterans Health Administration")
-          expect(table_row).to have_content(
-            "Current issue type: #{original_modification_request.issue_type}"
-          )
-          expect(table_row).to have_content(
-            "Current issue description: #{original_modification_request.issue_description}"
-          )
-          expect(table_row).to have_content(
-            "Current decision date: #{request_issue_decision_date.strftime('%m/%d/%Y')}"
-          )
-          expect(table_row).to have_content("New issue type: #{original_modification_request.new_issue_type}")
-          expect(table_row).to have_content(
-            "New issue description: #{original_modification_request.new_issue_description}"
-          )
-          expect(table_row).to have_content("New decision date: #{new_decision_date.strftime('%m/%d/%Y')}")
-          expect(table_row).to have_content(
-            "Modification request reason: #{original_modification_request.modification_request_reason}"
-          )
-        end
-      end
-    end
-  end
-
-  describe "check for cancelled claim" do
-    let!(:cancelled_claim) do
-      create(:supplemental_claim, :with_vha_issue, :with_update_users)
-    end
-
-    before do
-      cancelled_claim.establish!
-      cancelled_claim.request_issues.update(closed_status: "withdrawn", closed_at: Time.zone.now)
-      cancelled_claim.tasks.update(status: "cancelled")
-      cancelled_claim.reload
-
-      visit "/decision_reviews/vha/tasks/#{cancelled_claim.tasks[0].id}/history"
-    end
-
-    context "should do expected details to show claim closed when cancelled" do
-      it "Claim Cancelled" do
-        click_filter_option("Claim closed (1)")
+    expect(page).to have_text("Viewing 1-#{number_of_events} of #{number_of_events} total")
 
-        table = page.find("tbody")
-        expect(table).to have_selector("tr", count: 1)
+    table = page.find("tbody")
+    expect(table).to have_selector("tr", count: number_of_events)
 
-        table_row = table.first("tr")
-        expect(table_row).to have_content("Claim closed")
-        expect(table_row).to have_content("Claim cancelled.")
-      end
+    events.each do |event|
+      expect(page).to have_text(event.readable_event_type)
     end
   end
 end
diff --git a/spec/feature/non_comp/report_page_spec.rb b/spec/feature/non_comp/report_page_spec.rb
index dd022f03252..b714a8d328e 100644
--- a/spec/feature/non_comp/report_page_spec.rb
+++ b/spec/feature/non_comp/report_page_spec.rb
@@ -6,13 +6,11 @@
 require_relative "../../../app/services/claim_change_history/change_history_filter_parser.rb"
 
 feature "NonComp Report Page", :postgres do
-  include DownloadHelpers
   let(:non_comp_org) { VhaBusinessLine.singleton }
   let(:user) { create(:default_user, css_id: "REPORT USER", full_name: "Report User") }
   let(:vha_report_url) { "/decision_reviews/vha/report" }
 
   before do
-    clear_downloads
     User.stub = user
     non_comp_org.add_user(user)
     OrganizationsUser.make_user_admin(user, non_comp_org)
@@ -58,8 +56,18 @@
       expect(page).to have_button("Generate task report", disabled: false)
       click_button "Generate task report"
 
+      # This might happen too fast for capybara
+      # expect(page).to have_button("Generate task report", disabled: true)
+      # expect(page).to have_content("Generating CSV...")
+
       # Check the csv to make sure it returns the filter row, the column header row, and all 15 event rows
-      change_history_csv_file(17)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(17)
+
+      # CSV.foreach(csv_file) do |row|
+      #   puts "Row: #{row}"
+      # end
 
       # Add in some specific event filters now
       fill_in_specific_event_filters(["Added issue", "Completed disposition"])
@@ -69,7 +77,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, and the 6 event rows
-      change_history_csv_file(8)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(8)
 
       clear_filters
 
@@ -85,7 +95,9 @@
       expect(page).to have_button("Generate task report", disabled: false)
       click_button "Generate task report"
 
-      change_history_csv_file(6)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(6)
 
       # After submitting the form add one more condition and submit the form again
       add_personnel_condition_with_values([user.full_name])
@@ -102,7 +114,9 @@
       expect(page).to have_button("Generate task report", disabled: false)
       click_button "Generate task report"
 
-      change_history_csv_file(2)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(2)
     end
 
     it "should submit several types of status reports successfully and generate CSVs for each submission" do
@@ -116,7 +130,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, and one event row per task (3)
-      change_history_csv_file(5)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(5)
 
       # Click the status Summary radio button
       find("label", text: "Summary").click
@@ -125,7 +141,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, all 15 event rows
-      change_history_csv_file(17)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(17)
 
       # Select a specific status of cancelled
       fill_in_specific_status_filters(["Cancelled"])
@@ -134,7 +152,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, and 0 event rows
-      change_history_csv_file(2)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(2)
 
       clear_filters
 
@@ -148,7 +168,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, and the last two HLR event rows
-      change_history_csv_file(4)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(4)
 
       # Add another condition that has no matches
       add_issue_disposition_with_values(["Denied"])
@@ -156,7 +178,9 @@
       click_button "Generate task report"
 
       # Check the csv to make sure it returns the filter row, the column header row, all 0 event rows
-      change_history_csv_file(2)
+      csv_file = change_history_csv_file
+      number_of_rows = CSV.read(csv_file).length
+      expect(number_of_rows).to eq(2)
     end
 
     context "when request fails" do
@@ -282,7 +306,7 @@ def add_personnel_condition_with_values(values)
 
   def add_decision_review_condition_with_values(values)
     add_condition("Decision Review Type")
-    fill_in_multi_select_condition(values, "Decision Review Type", ".decision-review-types")
+    fill_in_decision_review_type(values)
   end
 
   def add_days_waiting_with_values(time_range, num_days, end_days = nil)
@@ -297,7 +321,7 @@ def add_issue_disposition_with_values(values)
 
   def add_issue_type_with_values(values)
     add_condition("Issue Type")
-    fill_in_multi_select_condition(values, "Issue Type", ".issue-types")
+    fill_in_multi_select_condition(values, "Issue Type", "issue-types")
   end
 
   def clear_filters
@@ -306,19 +330,14 @@ def clear_filters
     expect(page).to have_button("Generate task report", disabled: true)
   end
 
-  def latest_download
-    downloads.max_by { |file| File.mtime(file) }
-  end
-
-  def download_csv
-    wait_for_download
-    CSV.read(latest_download)
-  end
+  def change_history_csv_file
+    sleep 5
+    # Copied from Capybara setup
+    download_directory = Rails.root.join("tmp/downloads_#{ENV['TEST_SUBCATEGORY'] || 'all'}")
+    list_of_files = Dir.glob(File.join(download_directory, "*")).select { |f| File.file?(f) }
+    latest_file = list_of_files.max_by { |f| File.birthtime(f) }
 
-  def change_history_csv_file(rows)
-    csv_file = download_csv
-    expect(csv_file).to_not eq(nil)
-    expect(csv_file.length).to eq(rows)
-    clear_downloads
+    expect(latest_file).to_not eq(nil)
+    latest_file
   end
 end
diff --git a/spec/feature/non_comp/reviews_spec.rb b/spec/feature/non_comp/reviews_spec.rb
index 1cf36ba917c..f250c84ca98 100644
--- a/spec/feature/non_comp/reviews_spec.rb
+++ b/spec/feature/non_comp/reviews_spec.rb
@@ -10,7 +10,6 @@
   let(:veteran_b_on_hold) { create(:veteran, first_name: "Gaius", participant_id: "601172", ssn: "191039395") }
   let(:veteran_a_pending) { create(:veteran, first_name: "Dave", participant_id: "55667788", ssn: "123456789") }
   let(:veteran_c) { create(:veteran, first_name: "Ccc", participant_id: "1002345", ssn: "128455943") }
-  let(:veteran_remand) { create(:veteran, first_name: "B. Stark", participant_id: "100234567", ssn: "128455999") }
   let(:claimant_type) { :veteran_claimant }
   let(:hlr_a_on_hold) do
     create(:higher_level_review, veteran_file_number: veteran_a_on_hold.file_number, claimant_type: claimant_type)
@@ -25,7 +24,6 @@
   let(:hlr_b) { create(:higher_level_review, veteran_file_number: veteran_b.file_number, claimant_type: claimant_type) }
   let(:hlr_c) { create(:higher_level_review, veteran_file_number: veteran_c.file_number, claimant_type: claimant_type) }
   let(:appeal) { create(:appeal, veteran: veteran_c) }
-  let(:remand) { create(:remand, veteran_file_number: veteran_remand.file_number, claimant_type: claimant_type) }
 
   let!(:request_issue_a) do
     create(:request_issue, :nonrating, nonrating_issue_category: "Caregiver | Other", decision_review: hlr_a)
@@ -59,10 +57,6 @@
     create(:request_issue, :nonrating, nonrating_issue_category: "Other", decision_review: hlr_a_pending)
   end
 
-  let!(:remand_request_issue) do
-    create(:request_issue, :nonrating, nonrating_issue_category: "Beneficiary Travel", decision_review: remand)
-  end
-
   let!(:modification_request_a) do
     create(:issue_modification_request, decision_review: hlr_a_pending, requestor: user)
   end
@@ -113,12 +107,7 @@
              :in_progress,
              appeal: appeal,
              assigned_to: non_comp_org,
-             assigned_at: 1.day.ago),
-      create(:higher_level_review_task,
-             :in_progress,
-             appeal: remand,
-             assigned_to: non_comp_org,
-             assigned_at: today)
+             assigned_at: 1.day.ago)
     ]
   end
 
@@ -199,9 +188,9 @@ def current_table_rows
     scenario "displays tasks page with decision_review_queue_ssn_column feature toggle disabled" do
       visit BASE_URL
       expect(page).to have_content("Veterans Health Administration")
-      expect(page).to have_content("Incomplete Tasks (2)")
-      expect(page).to have_content("Pending Tasks (1)")
-      expect(page).to have_content("In Progress Tasks (4)")
+      expect(page).to have_content("Incomplete Tasks")
+      expect(page).to have_content("Pending Tasks")
+      expect(page).to have_content("In Progress Tasks")
       expect(page).to have_content("Completed Tasks")
 
       # default is the in progress page if no tab is specified in the url
@@ -209,24 +198,21 @@ def current_table_rows
       expect(page).to have_content("Issues")
       expect(page).to have_content("Issue Type")
       expect(page).to have_content("Higher-Level Review", count: 2)
-      expect(page).to have_content("Remand", count: 1)
       expect(page).to have_content("Board Grant")
       expect(page).to have_content(veteran_a.name)
       expect(page).to have_content(veteran_b.name)
       expect(page).to have_content(veteran_c.name)
-      expect(page).to have_content(veteran_remand.name)
       expect(page).to_not have_content(veteran_a_on_hold.name)
       expect(page).to_not have_content(veteran_b_on_hold.name)
       expect(page).to have_content(vet_id_column_header)
       expect(page).to have_content(vet_a_id_column_value)
       expect(page).to have_content(vet_b_id_column_value)
       expect(page).to have_content(vet_c_id_column_value)
-
       expect(page).to have_no_content(search_box_label)
 
       # ordered by assigned_at descending
       expect(page).to have_content(
-        /#{veteran_b.name}.+\s#{veteran_remand.name}.+\s#{veteran_c.name}.+\s#{veteran_a.name}/
+        /#{veteran_b.name}.+\s#{veteran_c.name}.+\s#{veteran_a.name}/
       )
 
       click_on "Incomplete Tasks"
@@ -255,6 +241,7 @@ def current_table_rows
       expect(page).to have_content("Higher-Level Review", count: 2)
       expect(page).to have_content("Date Completed")
 
+      # decision_date = hlr_b.request_issues.first.decision_date.strftime("%m\/%d\/%y")
       decision_date = hlr_b.tasks.first.closed_at.strftime("%m/%d/%y")
       # ordered by closed_at descending
       expect(page).to have_content(
@@ -275,9 +262,9 @@ def current_table_rows
       scenario "displays tasks page" do
         visit BASE_URL
         expect(page).to have_content("Veterans Health Administration")
-        expect(page).to have_content("Incomplete Tasks (2)")
-        expect(page).to have_content("Pending Tasks (1)")
-        expect(page).to have_content("In Progress Tasks (4)")
+        expect(page).to have_content("Incomplete Tasks")
+        expect(page).to have_content("Pending Tasks")
+        expect(page).to have_content("In Progress Tasks")
         expect(page).to have_content("Completed Tasks")
 
         # default is the in progress page if no tab is specified in the url
@@ -387,7 +374,7 @@ def current_table_rows
       table_rows = current_table_rows
 
       expect(table_rows.last.include?("Caregiver | Other\nCHAMPVA\n")).to eq true
-      expect(table_rows.first.include?(" Beneficiary Travel ")).to eq true
+      expect(table_rows.first.include?(" Camp Lejune Family Member ")).to eq true
 
       # Issue Types desc
       order_buttons[:issues_type].click
@@ -396,7 +383,7 @@ def current_table_rows
       )
       table_rows = current_table_rows
 
-      expect(table_rows.last.include?(" Beneficiary Travel ")).to eq true
+      expect(table_rows.last.include?(" Camp Lejune Family Member ")).to eq true
       expect(table_rows.first.include?("Caregiver | Other\nCHAMPVA")).to eq true
 
       # Days waiting asc
@@ -528,30 +515,22 @@ def current_table_rows
       end
     end
 
-    scenario "filtering reviews by appeal type" do
+    scenario "filtering reviews by appeal type", skip: true do
       visit BASE_URL
-
-      expect(page).to have_content("Higher-Level Review")
-      expect(page).to have_content("Board Grant")
-      expect(page).to have_content("Remand")
-
       find("[aria-label='Filter by type']").click
 
       # Check that task counts are being transmitted correctly from backend
       expect(page).to have_content("Board Grant (1)")
       expect(page).to have_content("Higher-Level Review (2)")
-      expect(page).to have_content("Remand (1)")
 
       find("label", text: "Higher-Level Review").click
-      expect(page).to have_content("Higher-Level Review", count: 2)
+      expect(page).to have_content("Higher-Level Review")
       expect(page).to_not have_content("Board Grant")
-      expect(page).to_not have_content("Remand")
       find(".cf-clear-filters-link").click
       expect(page).to have_content("Board Grant")
-      expect(page).to have_content("Remand")
     end
 
-    scenario "filtering reviews by issue type" do
+    scenario "filtering reviews by issue type", skip: true do
       visit BASE_URL
       find("[aria-label='Filter by issue type']").click
 
@@ -559,7 +538,6 @@ def current_table_rows
       expect(page).to have_content("Caregiver | Other (1)")
       expect(page).to have_content("Camp Lejune Family Member (1)")
       expect(page).to have_content("CHAMPVA (1)")
-      expect(page).to have_content("Beneficiary Travel (1)")
 
       find("label", text: "Caregiver | Other").click
       expect(page).to have_content("Caregiver | Other")
@@ -569,19 +547,16 @@ def current_table_rows
 
       # Verify the filter counts for the incomplete tab
       click_on "Incomplete Tasks"
-      expect(page).to have_content(COPY::VHA_INCOMPLETE_TAB_DESCRIPTION)
       find("[aria-label='Filter by issue type']").click
       expect(page).to have_content("Clothing Allowance (1)")
       expect(page).to have_content("Other (1)")
 
       click_on "Pending Tasks"
-      expect(page).to have_content(COPY::VHA_PENDING_REQUESTS_TAB_DESCRIPTION)
       find("[aria-label='Filter by issue type']").click
       expect(page).to have_content("Other (1)")
 
       # Verify the filter counts for the completed tab
       click_on "Completed Tasks"
-      expect(page).to have_content(COPY::QUEUE_PAGE_COMPLETE_LAST_SEVEN_DAYS_TASKS_DESCRIPTION)
       find("[aria-label='Filter by issue type']").click
       expect(page).to have_content("Apportionment (1)")
       expect(page).to have_content("Camp Lejune Family Member (1)")
@@ -775,17 +750,17 @@ def current_table_rows
                assigned_at: last_week)
       ]
     end
+    scenario "Duplicate issue types like Beneficiary Travel should be removed from the visible list of issue types" do
+      visit BASE_URL
+      hlr_c_regex = /#{veteran_c.name} #{veteran_c.ssn} 3\nBeneficiary Travel\nEligibility for Dental Treatment\n6 days Higher-Level Review/ # rubocop:disable Layout/LineLength
+      expect(page).to have_content(
+        hlr_c_regex
+      )
+    end
 
     scenario "Ordering issue types should ignore duplicates when ordering" do
       visit BASE_URL
 
-      step "Duplicate issue types like Beneficiary Travel should be removed from the visible list of issue types" do
-        hlr_c_regex = /#{veteran_c.name} #{veteran_c.ssn} 3\nBeneficiary Travel\nEligibility for Dental Treatment\n6 days Higher-Level Review/ # rubocop:disable Layout/LineLength
-        expect(page).to have_content(
-          hlr_c_regex
-        )
-      end
-
       issues_type_sort_button = find(:xpath, '//*[@id="case-table-description"]/thead/tr/th[4]/span/span[2]')
 
       issues_type_sort_button.click
@@ -813,7 +788,7 @@ def current_table_rows
       expect(table_rows.first.include?("B Veteran")).to eq true
     end
 
-    scenario "The Issue type column should orderable and filterable at the same time" do
+    scenario "The Issue type column should orderable and filterable at the same time", skip: true do
       visit BASE_URL
       issues_type_sort_button = find(:xpath, '//*[@id="case-table-description"]/thead/tr/th[4]/span/span[2]')
 
@@ -841,9 +816,6 @@ def current_table_rows
 
       table_rows = current_table_rows
 
-      sort_header = find('th[aria-labelledby="header-appealIssueTypes"]')
-      expect(sort_header[:'aria-sort']).to eq("ascending")
-
       expect(table_rows.first.include?("A Veteran")).to eq true
       expect(table_rows.last.include?("D Veteran")).to eq true
 
@@ -851,9 +823,6 @@ def current_table_rows
 
       table_rows = current_table_rows
 
-      sort_header = find('th[aria-labelledby="header-appealIssueTypes"]')
-      expect(sort_header[:'aria-sort']).to eq("descending")
-
       expect(table_rows.first.include?("D Veteran")).to eq true
       expect(table_rows.last.include?("A Veteran")).to eq true
 
@@ -861,9 +830,6 @@ def current_table_rows
       expect(page).to have_content("Spina Bifida Treatment (Non-Compensation)")
 
       table_rows = current_table_rows
-
-      sort_header = find('th[aria-labelledby="header-appealIssueTypes"]')
-      expect(sort_header[:'aria-sort']).to eq("descending")
       expect(table_rows.first.include?("B Veteran")).to eq true
       expect(table_rows.last.include?("A Veteran")).to eq true
     end
@@ -999,7 +965,7 @@ def current_table_rows
       pagination = page.find(class: "cf-pagination-pages", match: :first)
       pagination.find("Button", text: "2", match: :first).click
 
-      expect(page).to have_content("Viewing 16-30 of 34 total")
+      expect(page).to have_content("Viewing 16-30 of 33 total")
 
       # Navigate to another tab
       click_button("Incomplete Tasks")
@@ -1031,11 +997,9 @@ def current_table_rows
       expect(page).to have_content("Issue Type")
       expect(page).to have_content("Higher-Level Review", count: 4)
       expect(page).to have_content("Board Grant")
-      expect(page).to have_content("Remand")
       expect(page).to have_content(veteran_a.name)
       expect(page).to have_content(veteran_b.name)
       expect(page).to have_content(veteran_c.name)
-      expect(page).to have_content(veteran_remand.name)
       expect(page).to have_content(veteran_a_on_hold.name)
       expect(page).to have_content(veteran_b_on_hold.name)
       expect(page).to have_content(vet_id_column_header)
@@ -1046,7 +1010,7 @@ def current_table_rows
 
       # ordered by assigned_at descending
       expect(page).to have_content(
-        /#{veteran_b.name}.+\s#{veteran_remand.name}.+\s#{veteran_c.name}.+\s#{veteran_a.name}/
+        /#{veteran_b.name}.+\s#{veteran_c.name}.+\s#{veteran_a.name}/
       )
 
       click_on "Completed Tasks"
diff --git a/spec/jobs/missing_vacols_hearing_job_fix_spec.rb b/spec/jobs/missing_vacols_hearing_job_fix_spec.rb
deleted file mode 100644
index 69759d8d59f..00000000000
--- a/spec/jobs/missing_vacols_hearing_job_fix_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# frozen_string_literal: true
-
-describe MissingVacolsHearingJobFix do
-  subject { MissingVacolsHearingJobFix.new }
-  let!(:hearing) { create(:legacy_hearing, :with_tasks) }
-  let!(:hearing2) { create(:legacy_hearing, :with_tasks) }
-  let!(:hearing3) { create(:legacy_hearing, :with_tasks) }
-
-  context "missing_vacols_hearing" do
-    context "when AssignHearingDispositionTask is outdated and the associated hearing doesn't exist in VACOLS" do
-      it "cancels the task" do
-        task = AssignHearingDispositionTask.find_by(appeal: hearing.appeal)
-        task2 = AssignHearingDispositionTask.find_by(appeal: hearing2.appeal)
-        task3 = AssignHearingDispositionTask.find_by(appeal: hearing3.appeal)
-
-        vacols_case2 = VACOLS::CaseHearing.find_by(hearing_pkseq: task2.hearing.vacols_id)
-        vacols_case3 = VACOLS::CaseHearing.find_by(hearing_pkseq: task3.hearing.vacols_id)
-
-        task2.update(assigned_at: 3.years.ago)
-        task3.update(assigned_at: 1.year.ago)
-
-        expect(task.status).to eq("assigned")
-        expect(task2.status).to eq("assigned")
-        expect(VACOLS::CaseHearing.count).to eq(3)
-        vacols_case2.destroy!
-        vacols_case3.destroy!
-
-        expect(VACOLS::CaseHearing.count).to eq(1)
-        subject.perform
-
-        expect(VACOLS::CaseHearing.count).to eq(1)
-        expect(task.reload.status).to eq("assigned")
-        expect(task2.reload.status).to eq("cancelled")
-        expect(task3.reload.status).to eq("cancelled")
-        expect(task.hearing).to_not eq(nil)
-        expect(task3.hearing).to_not eq(nil)
-      end
-    end
-    context "when one of the AssignHearingDispositionTasks does not have an associated hearing" do
-      it "continues with the rest of the tasks and logs the error" do
-        allow(Rails.logger).to receive(:error)
-        task2 = AssignHearingDispositionTask.find_by(appeal: hearing2.appeal)
-        task3 = AssignHearingDispositionTask.find_by(appeal: hearing3.appeal)
-        vacols_case2 = VACOLS::CaseHearing.find_by(hearing_pkseq: task2.hearing.vacols_id)
-        vacols_case3 = VACOLS::CaseHearing.find_by(hearing_pkseq: task3.hearing.vacols_id)
-        task2.update(assigned_at: 3.years.ago)
-        task3.update(assigned_at: 1.year.ago)
-        string = "ALERT------- Task Id's: #{task2.id} are missing associated "\
-                 "hearings. This requires manual remediation------- ALERT"
-        vacols_case2.destroy
-        vacols_case3.destroy
-        task2.hearing.destroy
-        expect(task2.status).to eq(Constants.TASK_STATUSES.assigned)
-        expect(task3.status).to eq(Constants.TASK_STATUSES.assigned)
-        expect(task3.status).to eq(Constants.TASK_STATUSES.assigned)
-        Rails.logger.should_receive(:error).with(string)
-        subject.perform
-        expect(task3.reload.status).to eq(Constants.TASK_STATUSES.cancelled)
-        expect(task2.reload.status).to eq(Constants.TASK_STATUSES.assigned)
-      end
-    end
-    context "when one of the qualifying tasks is outside of the assigned_at parameters " do
-      it "should not process tasks that have an 'assigned_at' of over 7 years or before 5 months" do
-        task2 = AssignHearingDispositionTask.find_by(appeal: hearing2.appeal)
-        task3 = AssignHearingDispositionTask.find_by(appeal: hearing3.appeal)
-        vacols_case2 = VACOLS::CaseHearing.find_by(hearing_pkseq: task2.hearing.vacols_id)
-        vacols_case3 = VACOLS::CaseHearing.find_by(hearing_pkseq: task3.hearing.vacols_id)
-
-        task2.update(assigned_at: 3.months.ago)
-        task3.update(assigned_at: 8.years.ago)
-        vacols_case2.destroy
-        vacols_case3.destroy
-
-        expect(task2.status).to eq(Constants.TASK_STATUSES.assigned)
-        expect(task3.status).to eq(Constants.TASK_STATUSES.assigned)
-        subject.perform
-        expect(task2.status).to eq(Constants.TASK_STATUSES.assigned)
-        expect(task3.status).to eq(Constants.TASK_STATUSES.assigned)
-      end
-    end
-    context "when there are no qualifying AssignHearingDispositionTasks" do
-      it "should not fail/ return a successful message" do
-        expect(subject.perform).to be_truthy
-      end
-    end
-  end
-end
diff --git a/spec/lib/helpers/association_wrapper_spec.rb b/spec/lib/helpers/association_wrapper_spec.rb
index 4c8140a921a..86e157dc91b 100644
--- a/spec/lib/helpers/association_wrapper_spec.rb
+++ b/spec/lib/helpers/association_wrapper_spec.rb
@@ -26,7 +26,6 @@
                  [:legacy_appeal, "LegacyAppeal", "LegacyAppeal", nil, nil],
                  [:supplemental_claim, "SupplementalClaim", "SupplementalClaim", nil, nil],
                  [:higher_level_review, "HigherLevelReview", "HigherLevelReview", nil, nil],
-                 [:remand, "Remand", "Remand", nil, nil],
                  [:attorney_case_reviews, "AttorneyCaseReview", nil, nil, nil],
                  [:task_timers, "TaskTimer", nil, nil, nil],
                  [:cached_appeal, "CachedAppeal", nil, nil, nil]
@@ -46,8 +45,7 @@
           [:ama_appeal, nil],
           [:legacy_appeal, nil],
           [:higher_level_review, nil],
-          [:supplemental_claim, nil],
-          [:remand, nil]
+          [:supplemental_claim, nil]
         ]
         expect(subject.select_associations.map { |assoc| [assoc.name, assoc.options[:foreign_key]] }).to match_array [
           [:versions, nil],
@@ -64,8 +62,7 @@
           [:ama_appeal, "appeal_id"],
           [:legacy_appeal, "appeal_id"],
           [:higher_level_review, "appeal_id"],
-          [:supplemental_claim, "appeal_id"],
-          [:remand, "appeal_id"]
+          [:supplemental_claim, "appeal_id"]
         ]
 
         map_foreign_keys = lambda { |assoc|
@@ -89,8 +86,6 @@
           [:legacy_appeal, true, false, "appeal_id", "legacy_appeal_id", nil],
           [:higher_level_review, true, false, "appeal_id", "higher_level_review_id", nil],
           [:supplemental_claim, true, false, "appeal_id", "supplemental_claim_id", nil],
-          # Polymorphic `belongs_to :appeal`-related STI associations
-          [:remand, true, false, "appeal_id", "remand_id", nil],
           # has_many declared in Task
           # Note: JudgeCaseReview is not listed; that `belongs_to` association can be traced from JudgeCaseReview
           [:attorney_case_reviews, false, false, "task_id", "attorney_case_review_id", nil],
diff --git a/spec/models/appeal_spec.rb b/spec/models/appeal_spec.rb
index 038ba98ee74..48f10bb8329 100644
--- a/spec/models/appeal_spec.rb
+++ b/spec/models/appeal_spec.rb
@@ -278,15 +278,14 @@
 
     let!(:not_remanded_decision_issue) { create(:decision_issue, decision_review: appeal) }
 
-    it "creates remand, request issues, and starts processing" do
+    it "creates supplemental claim, request issues, and starts processing" do
       subject
 
-      remanded_supplemental_claims = Remand.where(decision_review_remanded: appeal)
+      remanded_supplemental_claims = SupplementalClaim.where(decision_review_remanded: appeal)
 
       expect(remanded_supplemental_claims.count).to eq(2)
 
       vbms_remand = remanded_supplemental_claims.find_by(benefit_type: "compensation")
-      expect(vbms_remand.type).to eq(Remand.name)
       expect(vbms_remand).to have_attributes(
         receipt_date: decision_date.to_date
       )
@@ -298,7 +297,6 @@
       expect(vbms_remand.tasks).to be_empty
 
       caseflow_remand = remanded_supplemental_claims.find_by(benefit_type: "nca")
-      expect(caseflow_remand.type).to eq(Remand.name)
       expect(caseflow_remand).to have_attributes(
         receipt_date: decision_date.to_date
       )
diff --git a/spec/models/business_line_spec.rb b/spec/models/business_line_spec.rb
index ef3205c1c03..f9e382d4742 100644
--- a/spec/models/business_line_spec.rb
+++ b/spec/models/business_line_spec.rb
@@ -29,18 +29,6 @@
       end
     end
 
-    context "Remand tasks" do
-      let!(:task_filters) { ["col=decisionReviewType&val=Remand"] }
-
-      it "Returning only Remand tasks" do
-        expect(
-          subject.all? do |task|
-            task.type == DecisionReviewTask.name && task.appeal.type == Remand.name
-          end
-        ).to eq true
-      end
-    end
-
     context "Veteran Record Request tasks" do
       let!(:task_filters) { ["col=decisionReviewType&val=VeteranRecordRequest"] }
 
@@ -67,6 +55,7 @@
         it "Attempting to return only Board Grant Effectuation tasks amounts to either only completed tasks
           or any empty result" do
           tasks = subject
+
           expect(tasks.empty? || tasks.all?(&:completed?)).to eq true
         end
       end
@@ -138,10 +127,6 @@
       create_list(:higher_level_review_task, 5, assigned_to: business_line)
     end
 
-    let!(:remand_tasks_on_active_decision_reviews) do
-      create_list(:remand_vha_task, 5, assigned_to: business_line)
-    end
-
     let!(:board_grant_effectuation_tasks) do
       tasks = create_list(:board_grant_effectuation_task, 5, assigned_to: business_line)
 
@@ -180,13 +165,12 @@
       after { FeatureToggle.disable!(:board_grant_effectuation_task) }
 
       it "All tasks associated with active decision reviews and BoardGrantEffectuationTasks are included" do
-        expect(subject.size).to eq 25
+        expect(subject.size).to eq 20
         expect(subject.map(&:id)).to match_array(
           (veteran_record_request_on_active_appeals +
             board_grant_effectuation_tasks +
             hlr_tasks_on_active_decision_reviews +
-            sc_tasks_on_active_decision_reviews +
-            remand_tasks_on_active_decision_reviews
+            sc_tasks_on_active_decision_reviews
           ).pluck(:id)
         )
       end
@@ -198,12 +182,11 @@
       before { FeatureToggle.disable!(:board_grant_effectuation_task) }
 
       it "All tasks associated with active decision reviews are included, but not BoardGrantEffectuationTasks" do
-        expect(subject.size).to eq 20
+        expect(subject.size).to eq 15
         expect(subject.map(&:id)).to match_array(
           (veteran_record_request_on_active_appeals +
             hlr_tasks_on_active_decision_reviews +
-            sc_tasks_on_active_decision_reviews +
-            remand_tasks_on_active_decision_reviews
+            sc_tasks_on_active_decision_reviews
           ).pluck(:id)
         )
       end
@@ -262,14 +245,6 @@
       )
     end
 
-    let!(:completed_remand_tasks) do
-      add_veteran_and_request_issues_to_decision_reviews(
-        complete_all_tasks(
-          create_list(:remand_task, 5, assigned_to: business_line)
-        )
-      )
-    end
-
     let!(:open_sc_tasks) do
       add_veteran_and_request_issues_to_decision_reviews(
         create_list(:supplemental_claim_task, 5, assigned_to: business_line)
@@ -320,13 +295,12 @@
       let!(:task_filters) { nil }
 
       it "All completed tasks are included in results" do
-        expect(subject.size).to eq 25
+        expect(subject.size).to eq 20
         expect(subject.map(&:id)).to match_array(
           (completed_hlr_tasks +
             completed_sc_tasks +
             completed_board_grant_effectuation_tasks +
-            completed_veteran_record_requests +
-            completed_remand_tasks
+            completed_veteran_record_requests
           ).pluck(:id)
         )
       end
@@ -420,10 +394,6 @@
         create_list(:supplemental_claim_vha_task, 5, assigned_to: business_line)
       end
 
-      let!(:remand_tasks_on_active_decision_reviews) do
-        create_list(:remand_vha_task, 5, assigned_to: business_line)
-      end
-
       # Set some on hold tasks as well
       let!(:on_hold_sc_tasks_on_active_decision_reviews) do
         tasks = create_list(:supplemental_claim_vha_task, 5, assigned_to: business_line)
@@ -473,14 +443,13 @@
         after { FeatureToggle.disable!(:board_grant_effectuation_task) }
 
         it "All tasks associated with active decision reviews and BoardGrantEffectuationTasks are included" do
-          expect(subject.size).to eq 30
+          expect(subject.size).to eq 25
           expect(subject.map(&:id)).to match_array(
             (veteran_record_request_on_active_appeals +
               board_grant_effectuation_tasks +
               hlr_tasks_on_active_decision_reviews +
               sc_tasks_on_active_decision_reviews +
-              on_hold_sc_tasks_on_active_decision_reviews +
-              remand_tasks_on_active_decision_reviews
+              on_hold_sc_tasks_on_active_decision_reviews
             ).pluck(:id)
           )
         end
@@ -492,13 +461,12 @@
         before { FeatureToggle.disable!(:board_grant_effectuation_task) }
 
         it "All tasks associated with active decision reviews are included, but not BoardGrantEffectuationTasks" do
-          expect(subject.size).to eq 25
+          expect(subject.size).to eq 20
           expect(subject.map(&:id)).to match_array(
             (veteran_record_request_on_active_appeals +
               hlr_tasks_on_active_decision_reviews +
               sc_tasks_on_active_decision_reviews +
-              on_hold_sc_tasks_on_active_decision_reviews +
-              remand_tasks_on_active_decision_reviews
+              on_hold_sc_tasks_on_active_decision_reviews
             ).pluck(:id)
           )
         end
@@ -518,29 +486,6 @@
                             benefit_type: "vha",
                             claimant_type: :dependent_claimant))
     end
-    let!(:hlr_task_with_imr) do
-      create(:issue_modification_request,
-             :with_higher_level_review,
-             :edit_of_request,
-             nonrating_issue_category: "Medical and Dental Care Reimbursement",
-             nonrating_issue_description: "Reimbursement note description")
-    end
-
-    let!(:sc_task_with_imr) do
-      create(:issue_modification_request,
-             :with_supplemental_claim,
-             :edit_of_request,
-             nonrating_issue_category: "Medical and Dental Care Reimbursement",
-             nonrating_issue_description: "Reimbursement note description")
-    end
-
-    let!(:remand_task) do
-      create(:remand_vha_task,
-             appeal: create(:remand,
-                            benefit_type: "vha",
-                            claimant_type: :dependent_claimant))
-    end
-
     let(:decision_issue) { create(:decision_issue, disposition: "denied", benefit_type: hlr_task.appeal.benefit_type) }
     let(:intake_user) { create(:user, full_name: "Alexander Dewitt", css_id: "ALEXVHA", station_id: "103") }
     let(:decision_user) { create(:user, full_name: "Gaius Baelsar", css_id: "GAIUSVHA", station_id: "104") }
@@ -549,7 +494,7 @@
     let(:hlr_task_1_ri_1_expectation) do
       a_hash_including(
         "nonrating_issue_category" => "Caregiver | Other",
-        "nonrating_issue_description" => "VHA - Caregiver",
+        "nonrating_issue_description" => "VHA - Caregiver ",
         "task_id" => hlr_task.id,
         "veteran_file_number" => hlr_task.appeal.veteran_file_number,
         "intake_user_name" => hlr_task.appeal.intake.user.full_name,
@@ -587,7 +532,7 @@
     let(:hlr_task_2_ri_1_expectation) do
       a_hash_including(
         "nonrating_issue_category" => "Caregiver | Other",
-        "nonrating_issue_description" => "VHA - Caregiver",
+        "nonrating_issue_description" => "VHA - Caregiver ",
         "task_id" => hlr_task2.id,
         "veteran_file_number" => hlr_task2.appeal.veteran_file_number,
         "intake_user_name" => intake_user.full_name,
@@ -641,48 +586,6 @@
         "days_waiting" => (Time.zone.today - Date.parse(sc_task.assigned_at.iso8601)).to_i
       )
     end
-    let(:imr_hlr_expectation) do
-      a_hash_including(
-        "requested_issue_type" => "Medical and Dental Care Reimbursement",
-        "requested_issue_description" => "Reimbursement note description",
-        "remove_original_issue" => false,
-        "modification_request_reason" => "I edited this request.",
-        "request_type" => "addition",
-        "issue_modification_request_status" => "assigned",
-        "decision_review_type" => "HigherLevelReview"
-      )
-    end
-    let(:imr_sc_expectation) do
-      a_hash_including(
-        "requested_issue_type" => "Medical and Dental Care Reimbursement",
-        "requested_issue_description" => "Reimbursement note description",
-        "remove_original_issue" => false,
-        "modification_request_reason" => "I edited this request.",
-        "request_type" => "addition",
-        "issue_modification_request_status" => "assigned",
-        "decision_reason" => nil,
-        "decision_review_type" => "SupplementalClaim"
-      )
-    end
-    let(:remand_task_1_ri_1_expectation) do
-      a_hash_including(
-        "nonrating_issue_category" => "Clothing Allowance",
-        "nonrating_issue_description" => "This is a Clothing Allowance issue",
-        "task_id" => remand_task.id,
-        "veteran_file_number" => remand_task.appeal.veteran_file_number,
-        "intake_user_name" => nil,
-        "intake_user_css_id" => nil,
-        "intake_user_station_id" => nil,
-        "disposition" => nil,
-        "decision_user_name" => nil,
-        "decision_user_css_id" => nil,
-        "decision_user_station_id" => nil,
-        "claimant_name" => remand_task.appeal.claimant.name,
-        "task_status" => remand_task.status,
-        "request_issue_benefit_type" => "vha",
-        "days_waiting" => (Time.zone.today - Date.parse(remand_task.assigned_at.iso8601)).to_i
-      )
-    end
 
     let(:all_expectations) do
       [
@@ -690,8 +593,7 @@
         hlr_task_1_ri_2_expectation,
         hlr_task_2_ri_1_expectation,
         hlr_task_2_ri_2_expectation,
-        sc_task_1_ri_1_expectation,
-        remand_task_1_ri_1_expectation
+        sc_task_1_ri_1_expectation
       ]
     end
 
@@ -704,16 +606,8 @@
                       nonrating_issue_category: "Camp Lejune Family Member",
                       nonrating_issue_description: "This is a Camp Lejune issue",
                       benefit_type: "vha")
-      remand_issue = create(:request_issue,
-                            nonrating_issue_category: "Clothing Allowance",
-                            nonrating_issue_description: "This is a Clothing Allowance issue",
-                            benefit_type: "vha",
-                            decision_review: remand_task.appeal)
       hlr_task.appeal.request_issues << issue
       hlr_task2.appeal.request_issues << issue2
-      remand_task.appeal.request_issues << remand_issue
-      remand_task.save
-      remand_task.reload
 
       # Add a different intake user to the second hlr task for data differences
       second_intake = hlr_task2.appeal.intake
@@ -747,22 +641,21 @@
 
     context "without filters" do
       it "should return all rows" do
-        expect(subject.count).to eq 8
+        expect(subject.count).to eq 5
         expect(subject.entries).to include(*all_expectations)
       end
     end
 
     context "with task_id filter" do
       context "with multiple task ids" do
-        let(:change_history_filters) { { task_id: [hlr_task.id, sc_task.id, remand_task.id] } }
+        let(:change_history_filters) { { task_id: [hlr_task.id, sc_task.id] } }
 
         it "should return rows for all matching ids" do
-          expect(subject.entries.count).to eq(4)
+          expect(subject.entries.count).to eq(3)
           expect(subject.entries).to include(
             hlr_task_1_ri_1_expectation,
             hlr_task_1_ri_2_expectation,
-            sc_task_1_ri_1_expectation,
-            remand_task_1_ri_1_expectation
+            sc_task_1_ri_1_expectation
           )
         end
       end
@@ -783,7 +676,7 @@
         let(:change_history_filters) { { claim_type: "SupplementalClaim" } }
 
         it "should only return rows for the filtered claim type" do
-          expect(subject.entries.count).to eq(2)
+          expect(subject.entries.count).to eq(1)
           expect(subject.entries).to include(sc_task_1_ri_1_expectation)
         end
       end
@@ -792,19 +685,8 @@
         let(:change_history_filters) { { claim_type: "HigherLevelReview" } }
 
         it "should only return rows for the filtered claim type" do
-          expect(subject.entries.count).to eq(5)
-          expect(subject.entries).to include(
-            *(all_expectations - [sc_task_1_ri_1_expectation] - [remand_task_1_ri_1_expectation])
-          )
-        end
-      end
-
-      context "Remand claim filter" do
-        let(:change_history_filters) { { claim_type: ["Remand"] } }
-
-        it "should only return rows for the filtered claim type" do
-          expect(subject.entries.count).to eq(1)
-          expect(subject.entries).to include(remand_task_1_ri_1_expectation)
+          expect(subject.entries.count).to eq(4)
+          expect(subject.entries).to include(*(all_expectations - [sc_task_1_ri_1_expectation]))
         end
       end
     end
@@ -821,32 +703,6 @@
       end
     end
 
-    context "with task status filter pending" do
-      let(:change_history_filters) { { task_status: ["pending"] } }
-
-      it "should only return rows for the filtered status types" do
-        expect(subject.entries.count).to eq(2)
-        expect(subject.entries).to include(
-          imr_hlr_expectation,
-          imr_sc_expectation
-        )
-      end
-    end
-
-    context "with task status filter pending and completed" do
-      let(:change_history_filters) { { task_status: %w[pending completed] } }
-
-      it "should only return rows for the filtered status types" do
-        expect(subject.entries.count).to eq(4)
-        expect(subject.entries).to include(
-          hlr_task_1_ri_1_expectation,
-          hlr_task_1_ri_2_expectation,
-          imr_hlr_expectation,
-          imr_sc_expectation
-        )
-      end
-    end
-
     context "with dispositions filter" do
       context "with multiple disposition filters" do
         let(:change_history_filters) { { dispositions: %w[Granted denied] } }
@@ -873,12 +729,11 @@
         let(:change_history_filters) { { dispositions: ["Blank"] } }
 
         it "should return rows that do not have a disposition" do
-          expect(subject.entries.count).to eq(6)
+          expect(subject.entries.count).to eq(3)
           expect(subject.entries).to include(
             hlr_task_2_ri_1_expectation,
             hlr_task_2_ri_2_expectation,
-            sc_task_1_ri_1_expectation,
-            remand_task_1_ri_1_expectation
+            sc_task_1_ri_1_expectation
           )
         end
 
@@ -886,25 +741,16 @@
           let(:change_history_filters) { { dispositions: %w[denied Blank] } }
 
           it "should return rows that match denied or have no disposition" do
-            expect(subject.entries.count).to eq(7)
+            expect(subject.entries.count).to eq(4)
             expect(subject.entries).to include(
               hlr_task_1_ri_2_expectation,
               hlr_task_2_ri_1_expectation,
               hlr_task_2_ri_2_expectation,
-              sc_task_1_ri_1_expectation,
-              remand_task_1_ri_1_expectation
+              sc_task_1_ri_1_expectation
             )
           end
         end
       end
-
-      context "with a single disposition filter and task status pending" do
-        let(:change_history_filters) { { dispositions: ["denied"], task_status: ["pending"] } }
-
-        it "should only not return any row since pending task cannot have disposition" do
-          expect(subject.entries.count).to eq(0)
-        end
-      end
     end
 
     context "with issue types filter" do
@@ -912,7 +758,7 @@
         let(:change_history_filters) { { issue_types: ["Beneficiary Travel", "CHAMPVA"] } }
 
         it "should only return rows for the filtered issue type values" do
-          expect(subject.entries.count).to eq(3)
+          expect(subject.entries.count).to eq(2)
           expect(subject.entries).to include(
             hlr_task_1_ri_2_expectation,
             sc_task_1_ri_1_expectation
@@ -924,22 +770,13 @@
         let(:change_history_filters) { { issue_types: ["Caregiver | Other"] } }
 
         it "should only return rows for the filtered issue type values" do
-          expect(subject.entries.count).to eq(3)
+          expect(subject.entries.count).to eq(2)
           expect(subject.entries).to include(
             hlr_task_1_ri_1_expectation,
             hlr_task_2_ri_1_expectation
           )
         end
       end
-
-      context "with a single issue type filter and pending task status" do
-        let(:change_history_filters) { { issue_types: ["Caregiver | Other"], task_status: ["pending"] } }
-
-        it "should only return rows for the filtered issue type values" do
-          expect(subject.entries.count).to eq(1)
-          expect(subject.entries).to include(imr_hlr_expectation)
-        end
-      end
     end
 
     context "with days waiting filter" do
@@ -947,7 +784,7 @@
         let(:change_history_filters) { { days_waiting: { number_of_days: 6, operator: "<" } } }
 
         it "should only return rows that are under the filtered days waiting value" do
-          expect(subject.entries.count).to eq(4)
+          expect(subject.entries.count).to eq(2)
           expect(subject.entries).to include(
             hlr_task_2_ri_1_expectation,
             hlr_task_2_ri_2_expectation
@@ -959,10 +796,9 @@
         let(:change_history_filters) { { days_waiting: { number_of_days: 11, operator: ">" } } }
 
         it "should only return rows that are over the filtered days waiting value" do
-          expect(subject.entries.count).to eq(2)
+          expect(subject.entries.count).to eq(1)
           expect(subject.entries).to include(
-            sc_task_1_ri_1_expectation,
-            remand_task_1_ri_1_expectation
+            sc_task_1_ri_1_expectation
           )
         end
       end
@@ -984,9 +820,7 @@
 
         it "should only return rows that are between the number of days and end of days" do
           expect(subject.entries.count).to eq(4)
-          expect(subject.entries).to include(
-            *(all_expectations - [sc_task_1_ri_1_expectation] - [remand_task_1_ri_1_expectation])
-          )
+          expect(subject.entries).to include(*(all_expectations - [sc_task_1_ri_1_expectation]))
         end
       end
     end
@@ -1006,9 +840,7 @@
 
         it "only return rows where either an intake, decisions, or updates user matches the station id" do
           expect(subject.entries.count).to eq(4)
-          expect(subject.entries).to include(
-            *(all_expectations - [sc_task_1_ri_1_expectation] - [remand_task_1_ri_1_expectation])
-          )
+          expect(subject.entries).to include(*(all_expectations - [sc_task_1_ri_1_expectation]))
         end
       end
 
@@ -1016,7 +848,7 @@
         let(:change_history_filters) { { facilities: ["101"] } }
 
         it "only return rows where either an intake, decisions, or updates user matches the station id" do
-          expect(subject.entries.count).to eq(5)
+          expect(subject.entries.count).to eq(3)
           expect(subject.entries).to include(
             hlr_task_1_ri_1_expectation,
             hlr_task_1_ri_2_expectation,
@@ -1041,9 +873,7 @@
 
         it "only return rows where either an intake, decisions, or updates user matches the  css_ids" do
           expect(subject.entries.count).to eq(4)
-          expect(subject.entries).to include(
-            *(all_expectations - [sc_task_1_ri_1_expectation] - [remand_task_1_ri_1_expectation])
-          )
+          expect(subject.entries).to include(*(all_expectations - [sc_task_1_ri_1_expectation]))
         end
       end
 
@@ -1075,20 +905,9 @@
           { issue_types: ["Beneficiary Travel", "CHAMPVA"], claim_type: "SupplementalClaim" }
         end
 
-        it "should only return rows that match both filters" do
-          expect(subject.entries.count).to eq(2)
-          expect(subject.entries).to include(sc_task_1_ri_1_expectation)
-        end
-      end
-
-      context "multiple issue types and claim type and task status pending" do
-        let(:change_history_filters) do
-          { issue_types: ["Beneficiary Travel", "CHAMPVA"], claim_type: "SupplementalClaim", task_status: ["pending"] }
-        end
-
         it "should only return rows that match both filters" do
           expect(subject.entries.count).to eq(1)
-          expect(subject.entries).to include(imr_sc_expectation)
+          expect(subject.entries).to include(sc_task_1_ri_1_expectation)
         end
       end
     end
diff --git a/spec/models/decision_issue_spec.rb b/spec/models/decision_issue_spec.rb
index 4013a9ded31..3ed5a1fb89e 100644
--- a/spec/models/decision_issue_spec.rb
+++ b/spec/models/decision_issue_spec.rb
@@ -419,30 +419,6 @@
           end
         end
       end
-      context "decision review type" do
-        context "when type is Appeal" do
-          let(:decision_review) { create(:appeal) }
-
-          it "creates a Remand class" do
-            expect(subject.type).to eq(Remand.name)
-          end
-        end
-
-        context "when type is HLR" do
-          let(:decision_review) { create(:higher_level_review) }
-          before do
-            decision_review.create_claimant!(
-              participant_id: "98765",
-              payee_code: "00",
-              type: "VeteranClaimant"
-            )
-          end
-
-          it "creates a SupplementalClaim class" do
-            expect(subject.type).to eq(SupplementalClaim.name)
-          end
-        end
-      end
     end
   end
 end
diff --git a/spec/models/higher_level_review_spec.rb b/spec/models/higher_level_review_spec.rb
index 031fb9ae2c0..9182f62a383 100644
--- a/spec/models/higher_level_review_spec.rb
+++ b/spec/models/higher_level_review_spec.rb
@@ -264,7 +264,6 @@
         expect(supplemental_claim).to_not be_nil
         expect(supplemental_claim.establishment_submitted_at).to_not be_nil
         expect(supplemental_claim.request_issues.count).to eq(2)
-        expect(supplemental_claim.type).to eq(SupplementalClaim.name)
 
         first_dta_request_issue = RequestIssue.find_by(
           decision_review: supplemental_claim,
@@ -333,7 +332,6 @@
               caseflow_decision_date.to_date + vbms_offset -
               SupplementalClaim.processing_retry_interval_hours.hours + 1.minute
             )
-            expect(dta_sc.type).to eq(SupplementalClaim.name)
             expect do
               subject
             end.to_not have_enqueued_job(DecisionReviewProcessJob)
diff --git a/spec/models/supplemental_claim_spec.rb b/spec/models/supplemental_claim_spec.rb
index 702e7d57197..96360af191f 100644
--- a/spec/models/supplemental_claim_spec.rb
+++ b/spec/models/supplemental_claim_spec.rb
@@ -25,17 +25,6 @@
     )
   end
 
-  let(:remand) do
-    Remand.new(
-      veteran_file_number: veteran_file_number,
-      receipt_date: receipt_date,
-      benefit_type: benefit_type,
-      legacy_opt_in_approved: legacy_opt_in_approved,
-      veteran_is_not_claimant: veteran_is_not_claimant,
-      decision_review_remanded: decision_review_remanded
-    )
-  end
-
   let!(:intake) do
     create(:intake, user: current_user, detail: supplemental_claim, veteran_file_number: veteran_file_number)
   end
@@ -55,11 +44,6 @@
         let(:legacy_opt_in_approved) { false }
         let(:receipt_date) { 1.day.ago }
 
-        it "sets the type column correctly" do
-          expect(supplemental_claim.type).to eq(SupplementalClaim.name)
-          expect(remand.type).to eq(Remand.name)
-        end
-
         it "is valid" do
           is_expected.to be true
         end
@@ -136,17 +120,6 @@
   end
 
   context "create_remand_issues!" do
-    let(:classifier) { Remand }
-    let(:supplemental_claim) do
-      classifier.new(
-        veteran_file_number: veteran_file_number,
-        receipt_date: receipt_date,
-        benefit_type: benefit_type,
-        legacy_opt_in_approved: legacy_opt_in_approved,
-        veteran_is_not_claimant: veteran_is_not_claimant,
-        decision_review_remanded: decision_review_remanded
-      )
-    end
     subject { supplemental_claim.create_remand_issues! }
 
     let(:decision_review_remanded) { create(:appeal) }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 4521dd0a544..42fef233216 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -102,7 +102,7 @@
 end
 
 # Wrap this around your test to run it many times and ensure that it passes consistently.
-# Note: do not merge to main like this, or the tests will be slow! Ha.
+# Note: do not merge to master like this, or the tests will be slow! Ha.
 def ensure_stable
   repeat_count = ENV.fetch("ENSURE_STABLE", "10").to_i
   repeat_count.times do
diff --git a/spec/services/business_line_reporter_spec.rb b/spec/services/business_line_reporter_spec.rb
index 1a5604e3501..ffbf5bf373e 100644
--- a/spec/services/business_line_reporter_spec.rb
+++ b/spec/services/business_line_reporter_spec.rb
@@ -14,35 +14,17 @@
   let(:third_appeal) { create(:appeal, :with_post_intake_tasks) }
   let(:third_ama_task) { create(:ama_task, appeal: third_appeal, assigned_to: business_line) }
 
-  let(:remand) { create(:remand, benefit_type: business_line.url, claimant_type: :veteran_claimant) }
-  let(:remand_task) do
-    DecisionReviewTask.create!(appeal: remand, assigned_at: Time.zone.now, assigned_to: business_line)
-  end
-
-  let(:hlr) { create(:higher_level_review, benefit_type: business_line.url, claimant_type: :veteran_claimant) }
-  let(:hlr_task) { DecisionReviewTask.create!(appeal: hlr, assigned_at: Time.zone.now, assigned_to: business_line) }
-
-  let(:supplemental_claim) do
-    create(:supplemental_claim, benefit_type: business_line.url, claimant_type: :veteran_claimant)
-  end
-  let(:sc_task) do
-    DecisionReviewTask.create!(appeal: supplemental_claim, assigned_at: Time.zone.now, assigned_to: business_line)
-  end
-
   before do
     Timecop.freeze(Time.utc(2020, 1, 1, 19, 0, 0))
     first_ama_task.completed!
     second_ama_task.completed!
-    remand_task.completed!
-    hlr_task.completed!
-    sc_task.completed!
   end
 
   describe "#tasks" do
     subject { BusinessLineReporter.new(business_line).tasks }
 
     it "returns the completed tasks" do
-      expect(subject).to include(first_ama_task, second_ama_task, remand_task, hlr_task, sc_task)
+      expect(subject).to include(first_ama_task, second_ama_task)
     end
 
     it "does not return an open task" do
@@ -59,9 +41,6 @@ def expected_csv
         business_line,appeal_id,appeal_type,claimant_name,request_issues_count,decision_issues_count,veteran_file_number,intake_user_id,task_type,task_id,tasks_url,task_assigned_to,created_at,closed_at
         #{business_line.name},#{first_appeal.id},Appeal,#{first_appeal.claimant.name},0,0,#{first_appeal.veteran.file_number},,Task,#{first_ama_task.id},https://appeals.cf.ds.va.gov#{business_line.tasks_url}/tasks/#{first_ama_task.id},#{first_ama_task.assigned_to.name},2020-01-01,2020-01-01
         #{business_line.name},#{second_appeal.id},Appeal,#{second_appeal.claimant.name},0,0,#{second_appeal.veteran.file_number},,Task,#{second_ama_task.id},https://appeals.cf.ds.va.gov#{business_line.tasks_url}/tasks/#{second_ama_task.id},#{second_ama_task.assigned_to.name},2020-01-01,2020-01-01
-        #{business_line.name},#{remand.id},Remand,#{remand.claimant.name},0,0,#{remand.veteran.file_number},,DecisionReviewTask,#{remand_task.id},https://appeals.cf.ds.va.gov#{business_line.tasks_url}/tasks/#{remand_task.id},#{remand_task.assigned_to.name},2020-01-01,2020-01-01
-        #{business_line.name},#{hlr.id},Higher-Level Review,#{hlr.claimant.name},0,0,#{hlr.veteran.file_number},,DecisionReviewTask,#{hlr_task.id},https://appeals.cf.ds.va.gov#{business_line.tasks_url}/tasks/#{hlr_task.id},#{hlr_task.assigned_to.name},2020-01-01,2020-01-01
-        #{business_line.name},#{supplemental_claim.id},Supplemental Claim,#{supplemental_claim.claimant.name},0,0,#{supplemental_claim.veteran.file_number},,DecisionReviewTask,#{sc_task.id},https://appeals.cf.ds.va.gov#{business_line.tasks_url}/tasks/#{sc_task.id},#{sc_task.assigned_to.name},2020-01-01,2020-01-01
       EOF
     end
     # rubocop:enable Metrics/AbcSize
diff --git a/spec/services/claim_change_history/change_history_event_serializer_spec.rb b/spec/services/claim_change_history/change_history_event_serializer_spec.rb
index 5829c4c02de..540cc563f2d 100644
--- a/spec/services/claim_change_history/change_history_event_serializer_spec.rb
+++ b/spec/services/claim_change_history/change_history_event_serializer_spec.rb
@@ -36,29 +36,6 @@
     ClaimHistoryService.new(vha_org, task_id: vha_task.id).build_events
   end
 
-  let(:modificationRequestDetailsObject) do
-    {
-      benefitType: "vha",
-      requestType: nil,
-      issueModificationRequestWithdrawalDate: nil,
-      modificationRequestReason: nil,
-      newDecisionDate: nil,
-      newIssueDescription: nil,
-      newIssueType: nil,
-      previousDecisionDate: nil,
-      previousIssueDescription: nil,
-      previousIssueType: nil,
-      previousModificationRequestReason: nil,
-      previousWithdrawalDate: nil,
-      removeOriginalIssue: nil,
-      issueModificationRequestStatus: nil,
-      requestor: nil,
-      decider: nil,
-      decidedAtDate: nil,
-      decisionReason: nil
-    }
-  end
-
   let(:serialized_hash_array) do
     [
       {
@@ -66,24 +43,23 @@
         type: :change_history_event,
         attributes: {
           claimType: "Higher-Level Review",
-          readableEventType: "Claim created",
           claimantName: events[0].claimant_name,
-          eventUser: "L. Roth",
+          details:
+          {
+            benefitType: "vha",
+            decisionDate: nil,
+            decisionDescription: nil,
+            disposition: nil,
+            dispositionDate: nil,
+            issueDescription: nil,
+            issueType: nil,
+            withdrawalRequestDate: nil
+          },
           eventDate: events[0].event_date,
           eventType: :claim_creation,
-          taskID: vha_task.id,
-          details:
-            {
-              benefitType: "vha",
-              decisionDate: nil,
-              decisionDescription: nil,
-              disposition: nil,
-              dispositionDate: nil,
-              issueDescription: nil,
-              issueType: nil,
-              withdrawalRequestDate: nil
-            },
-          modificationRequestDetails: modificationRequestDetailsObject
+          eventUser: "L. Roth",
+          readableEventType: "Claim created",
+          taskID: vha_task.id
         }
       },
       {
@@ -91,7 +67,6 @@
         type: :change_history_event,
         attributes: {
           claimType: "Higher-Level Review",
-          readableEventType: "Added issue",
           claimantName: events[1].claimant_name,
           details:
           {
@@ -104,34 +79,10 @@
             issueType: "Other",
             withdrawalRequestDate: nil
           },
-          modificationRequestDetails: modificationRequestDetailsObject,
           eventDate: events[1].event_date,
           eventType: :added_issue,
           eventUser: "L. Roth",
-          taskID: vha_task.id
-        }
-      },
-      {
-        id: expected_uuid,
-        type: :change_history_event,
-        attributes: {
-          eventType: :in_progress,
-          eventUser: "System",
-          claimType: "Higher-Level Review",
-          readableEventType: "Claim status - In progress",
-          claimantName: events[2].claimant_name,
-          details: {
-            benefitType: "vha",
-            issueType: nil,
-            issueDescription: nil,
-            decisionDate: nil,
-            disposition: nil,
-            decisionDescription: nil,
-            dispositionDate: nil,
-            withdrawalRequestDate: nil
-          },
-          modificationRequestDetails: modificationRequestDetailsObject,
-          eventDate: events[2].event_date,
+          readableEventType: "Added issue",
           taskID: vha_task.id
         }
       }
diff --git a/spec/services/claim_change_history/change_history_reporter_spec.rb b/spec/services/claim_change_history/change_history_reporter_spec.rb
index 4fba9383dc7..c5dcc4bbbbd 100644
--- a/spec/services/claim_change_history/change_history_reporter_spec.rb
+++ b/spec/services/claim_change_history/change_history_reporter_spec.rb
@@ -145,95 +145,6 @@
         new_event.instance_variable_set(:@task_status, "cancelled")
         new_event
       end
-      let(:pending_issue_event) do
-        new_event = removed_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :pending)
-        new_event.instance_variable_set(:@task_status, "assigned")
-        new_event
-      end
-      let(:issue_modification_request_event) do
-        new_event = pending_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :modification)
-        new_event.instance_variable_set(:@task_status, "assigned")
-        new_event
-      end
-
-      let(:remand_claim_creation_event) do
-        new_event = added_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :claim_creation)
-        new_event.instance_variable_set(:@event_user_name, "System")
-        new_event.instance_variable_set(:@user_facility, nil)
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_in_progress_status_event) do
-        new_event = claim_creation_event.clone
-        new_event.instance_variable_set(:@event_type, :in_progress)
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_cancelled_status_event) do
-        new_event = in_progress_status_event.clone
-        new_event.instance_variable_set(:@event_type, :cancelled)
-        new_event.instance_variable_set(:@task_status, "cancelled")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_completed_status_event) do
-        new_event = in_progress_status_event.clone
-        new_event.instance_variable_set(:@event_type, :completed)
-        new_event.instance_variable_set(:@task_status, "completed")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_incomplete_status_event) do
-        new_event = in_progress_status_event.clone
-        new_event.instance_variable_set(:@event_type, :incomplete)
-        new_event.instance_variable_set(:@task_status, "on_hold")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_added_issue_without_decision_date_event) do
-        new_event = added_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :added_issue_without_decision_date)
-        new_event.instance_variable_set(:@task_status, "on_hold")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event.instance_variable_set(:@decision_date, nil)
-        new_event
-      end
-      let(:remand_completed_disposition_event) do
-        new_event = added_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :completed_disposition)
-        new_event.instance_variable_set(:@task_status, "completed")
-        new_event.instance_variable_set(:@disposition, "Granted")
-        new_event.instance_variable_set(:@decision_description, "Decision for CHAMPVA issue")
-        new_event.instance_variable_set(:@disposition_date, 4.days.ago.iso8601)
-        new_event.instance_variable_set(:@user_facility, "200")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_added_decision_date_event) do
-        new_event = completed_disposition_event.clone
-        new_event.instance_variable_set(:@event_type, :added_decision_date)
-        new_event.instance_variable_set(:@task_status, "assigned")
-        new_event.instance_variable_set(:@task_id, 900)
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_removed_issue_event) do
-        new_event = added_decision_date_event.clone
-        new_event.instance_variable_set(:@event_type, :removed_issue)
-        new_event.instance_variable_set(:@task_status, "cancelled")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
-      let(:remand_withdrew_issue_event) do
-        new_event = removed_issue_event.clone
-        new_event.instance_variable_set(:@event_type, :withdrew_issue)
-        new_event.instance_variable_set(:@task_status, "cancelled")
-        new_event.instance_variable_set(:@claim_type, "Remand")
-        new_event
-      end
 
       let(:events) do
         [
@@ -247,19 +158,7 @@
           completed_disposition_event,
           added_decision_date_event,
           removed_issue_event,
-          withdrew_issue_event,
-          pending_issue_event,
-          issue_modification_request_event,
-          remand_claim_creation_event,
-          remand_in_progress_status_event,
-          remand_cancelled_status_event,
-          remand_completed_status_event,
-          remand_incomplete_status_event,
-          remand_added_issue_without_decision_date_event,
-          remand_completed_disposition_event,
-          remand_added_decision_date_event,
-          remand_removed_issue_event,
-          remand_withdrew_issue_event
+          withdrew_issue_event
         ]
       end
 
@@ -278,11 +177,6 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           added_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -301,11 +195,6 @@
           "Claim created",
           nil,
           "Claim created.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -324,11 +213,6 @@
           "Claim status - In progress",
           nil,
           "Claim can be processed.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -346,12 +230,7 @@
           cancelled_status_event.readable_event_date,
           "Claim closed",
           nil,
-          "Claim cancelled.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
+          "Claim closed.",
           nil
         ]
       end
@@ -369,11 +248,6 @@
           "Claim closed",
           nil,
           "Claim closed.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -391,11 +265,6 @@
           "Claim status - Incomplete",
           nil,
           "Claim cannot be processed until decision date is entered.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -414,11 +283,6 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           added_issue_without_decision_date_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -437,11 +301,6 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           completed_disposition_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           "Granted",
           "Decision for CHAMPVA issue",
           completed_disposition_event.readable_disposition_date
@@ -462,11 +321,6 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           added_decision_date_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -485,11 +339,6 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           removed_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
@@ -508,293 +357,12 @@
           "CHAMPVA",
           "CHAMPVA issue description",
           withdrew_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:pending_issue_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/900",
-          "in progress",
-          "20",
-          "Higher-Level Review",
-          "Austin AAC (200)",
-          "E. Thompson",
-          added_issue_event.readable_event_date,
-          "Claim status - Pending",
-          nil,
-          "Claim cannot be processed until VHA admin reviews pending requests.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:modification_issue_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/900",
-          "in progress",
-          "20",
-          "Higher-Level Review",
-          "Austin AAC (200)",
-          "E. Thompson",
-          added_issue_event.readable_event_date,
-          "Requested issue modification",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          added_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-
-      let(:remand_claim_creation_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "in progress",
-          "20",
-          "Remand",
-          "",
-          "System",
-          remand_claim_creation_event.readable_event_date,
-          "Claim created",
-          nil,
-          "Claim created.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-
-      let(:remand_in_progress_status_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "in progress",
-          "20",
-          "Remand",
-          "",
-          "System",
-          remand_in_progress_status_event.readable_event_date,
-          "Claim status - In progress",
-          nil,
-          "Claim can be processed.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-
-      let(:remand_cancelled_status_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "cancelled",
-          "20",
-          "Remand",
-          "",
-          "System",
-          remand_cancelled_status_event.readable_event_date,
-          "Claim closed",
-          nil,
-          "Claim cancelled.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_completed_status_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "completed",
-          "20",
-          "Remand",
-          "",
-          "System",
-          remand_completed_status_event.readable_event_date,
-          "Claim closed",
-          nil,
-          "Claim closed.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_incomplete_status_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "incomplete",
-          "20",
-          "Remand",
-          "",
-          "System",
-          remand_incomplete_status_event.readable_event_date,
-          "Claim status - Incomplete",
-          nil,
-          "Claim cannot be processed until decision date is entered.",
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_added_issue_without_decision_date_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "incomplete",
-          "20",
-          "Remand",
-          "VACO (101)",
-          "E. Thompson",
-          remand_added_issue_without_decision_date_event.readable_event_date,
-          "Added issue - No decision date",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          remand_added_issue_without_decision_date_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_completed_disposition_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/999",
-          "completed",
-          "20",
-          "Remand",
-          "Austin AAC (200)",
-          "E. Thompson",
-          remand_completed_disposition_event.readable_event_date,
-          "Completed disposition",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          remand_completed_disposition_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          "Granted",
-          "Decision for CHAMPVA issue",
-          remand_completed_disposition_event.readable_disposition_date
-        ]
-      end
-      let(:remand_added_decision_date_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/900",
-          "in progress",
-          "20",
-          "Remand",
-          "Austin AAC (200)",
-          "E. Thompson",
-          remand_added_decision_date_event.readable_event_date,
-          "Added decision date",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          remand_added_decision_date_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_removed_issue_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/900",
-          "cancelled",
-          "20",
-          "Remand",
-          "Austin AAC (200)",
-          "E. Thompson",
-          remand_removed_issue_event.readable_event_date,
-          "Removed issue",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          remand_removed_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil
-        ]
-      end
-      let(:remand_withdrew_issue_event_row) do
-        [
-          "242080004",
-          "Mason Rodriguez",
-          "/decision_reviews/vha/tasks/900",
-          "cancelled",
-          "20",
-          "Remand",
-          "Austin AAC (200)",
-          "E. Thompson",
-          remand_withdrew_issue_event.readable_event_date,
-          "Withdrew issue",
-          "CHAMPVA",
-          "CHAMPVA issue description",
-          remand_withdrew_issue_event.readable_decision_date,
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
           nil
         ]
       end
 
       it "returns a csv string with the column headers, filters, and event rows" do
         rows = CSV.parse(subject)
-
         expect(rows.count).to eq(2 + events.length)
         expect(rows[0]).to eq([])
         expect(rows[1]).to eq(column_headers)
@@ -809,18 +377,6 @@
         expect(rows[10]).to eq(added_decision_date_event_row)
         expect(rows[11]).to eq(removed_issue_event_row)
         expect(rows[12]).to eq(withdrew_issue_event_row)
-        expect(rows[13]).to eq(pending_issue_event_row)
-        expect(rows[14]).to eq(modification_issue_event_row)
-        expect(rows[15]).to eq(remand_claim_creation_event_row)
-        expect(rows[16]).to eq(remand_in_progress_status_event_row)
-        expect(rows[17]).to eq(remand_cancelled_status_event_row)
-        expect(rows[18]).to eq(remand_completed_status_event_row)
-        expect(rows[19]).to eq(remand_incomplete_status_event_row)
-        expect(rows[20]).to eq(remand_added_issue_without_decision_date_event_row)
-        expect(rows[21]).to eq(remand_completed_disposition_event_row)
-        expect(rows[22]).to eq(remand_added_decision_date_event_row)
-        expect(rows[23]).to eq(remand_removed_issue_event_row)
-        expect(rows[24]).to eq(remand_withdrew_issue_event_row)
       end
     end
   end
diff --git a/spec/services/claim_change_history/claim_history_event_spec.rb b/spec/services/claim_change_history/claim_history_event_spec.rb
index 0dc5263585f..1ee915d9c08 100644
--- a/spec/services/claim_change_history/claim_history_event_spec.rb
+++ b/spec/services/claim_change_history/claim_history_event_spec.rb
@@ -48,37 +48,7 @@
       "event_date" => change_data_event_date,
       "task_versions" => version_changes,
       "days_waiting" => 25,
-      "task_closed_at" => "2023-10-19 22:47:16.233187",
-      "issue_modification_request_id" => 61,
-      "requested_issue_type" => "Caregiver | Tier Level",
-      "requested_issue_description" => "test",
-      "remove_original_issue" => nil,
-      "modification_request_reason" => "Testing",
-      "requested_decision_date" => "2024-07-07",
-      "request_type" => request_type,
-      "issue_modification_request_status" => "cancelled",
-      "decision_reason" => nil,
-      "decider_id" => nil,
-      "requestor_id" => "2000006012",
-      "decided_at" => nil,
-      "issue_modification_request_created_at" => issue_modification_request_created_at,
-      "issue_modification_request_updated_at" => "2024-07-22 15:58:42.908194",
-      "issue_modification_request_edited_at" => nil,
-      "issue_modification_request_withdrawal_date" => nil,
-      "decision_review_id" => 65,
-      "decision_review_type" => "HigherLevelReview",
-      "requestor" => "Monte Mann",
-      "requestor_station_id" => "741",
-      "requestor_css_id" => "ACBAUERVVHAH",
-      "decider" => nil,
-      "decider_station_id" => nil,
-      "decider_css_id" => nil,
-      "imr_versions" => imr_versions,
-      "previous_imr_created_at" => nil,
-      "updater_user_name" => "Monte Mann",
-      "is_assigned_present" => is_assigned_present,
-      "previous_state_array" => previous_state_array,
-      "type_classifier" => change_data_claim_type
+      "task_closed_at" => "2023-10-19 22:47:16.233187"
     }
   end
 
@@ -92,20 +62,8 @@
   let(:change_data_decision_date) { "2023-05-31" }
   let(:change_data_decision_date_added_at) { Time.zone.parse("2023-10-19 22:48:25.281657") }
   let(:version_changes) { nil }
-  let(:imr_versions) { nil }
-  let(:request_type) { :addition }
   let(:request_issue_update_time) { Time.zone.parse("2023-10-19 22:47:16.233187") }
   let(:request_issue_created_at) { Time.zone.parse("2023-10-19 22:45:43.108934") }
-  let(:issue_modification_request_created_at) { Time.zone.parse("2023-10-20 22:47:16.233187") }
-  let(:previous_imr_created_at) { Time.zone.parse("2023-10-19 22:47:16.233187") }
-  let(:out_of_bounds_time) { Time.utc(9999, 12, 31, 23, 59, 59) }
-
-  let(:decision_reason) { nil }
-  let(:decider_id) { nil }
-  let(:decided_at) { nil }
-  let(:is_assigned_present) { false }
-  let(:previous_state_array) {}
-
   let(:event_attribute_data) do
     {
       assigned_at: Time.zone.parse("2023-10-19 22:47:16.222148"),
@@ -158,19 +116,6 @@
     }
   end
 
-  let(:issue_modification_request_attribute_data) do
-    {
-      request_type: request_type,
-      new_issue_type: "Caregiver | Tier Level",
-      new_issue_description: "test",
-      new_decision_date: "2024-07-07",
-      modification_request_reason: "Testing",
-      decision_reason: nil,
-      decided_at_date: nil,
-      issue_modification_request_withdrawal_date: nil
-    }
-  end
-
   let(:intake_event_data) do
     {
       event_date: change_data["intake_completed_at"],
@@ -189,68 +134,6 @@
     }
   end
 
-  let(:pending_attribute_data) do
-    {
-      event_type: :pending,
-      claimant_name: "Bob Smithboehm",
-      event_user_name: "System"
-    }
-  end
-  let(:in_progress_attribute_data) do
-    {
-      event_type: :in_progress,
-      claimant_name: "Bob Smithboehm",
-      event_user_name: "System"
-    }
-  end
-  let(:modification_request_decision_date) { Time.zone.parse("2024-07-28").to_date }
-  let(:modification_attribute_data) do
-    {
-      event_type: :modification,
-      request_type: :modification,
-      benefit_type: "vha",
-      issue_type: "Clothing Allowance",
-      issue_description: "Clothing allowance no decision date",
-      decision_date: "2023-05-31",
-      new_issue_type: "Caregiver | Eligibility",
-      new_issue_description: "Rejection of withrwaslasas",
-      new_decision_date: modification_request_decision_date,
-      modification_request_reason: "Please withdwasdadsadadadad",
-      previous_issue_type: "Caregiver | Eligibility",
-      previous_issue_description: "Rejection of withrwaslasas",
-      previous_decision_date: modification_request_decision_date,
-      previous_modification_request_reason: "Please withdwasdadsadadadad"
-    }
-  end
-  let(:issue_modification_response_attribute) do
-    {
-      event_type: :request_approved,
-      request_type: request_type,
-      new_issue_type: "Caregiver | Tier Level",
-      new_issue_description: "test",
-      new_decision_date: "2024-07-07",
-      modification_request_reason: "Testing"
-    }
-  end
-
-  let(:issue_modification_edited_attribute) do
-    {
-      event_type: :request_edited,
-      request_type: :withdrawal,
-      issue_type: "Clothing Allowance",
-      issue_description: "Clothing allowance no decision date",
-      new_issue_type: "Caregiver | Eligibility",
-      new_issue_description: "modifiedvalue",
-      new_decision_date: modification_request_decision_date,
-      modification_request_reason: "Addition is the only request issue-modifiedvalue Z",
-      event_user_name: "Monte Mann",
-      previous_issue_type: "Caregiver | Eligibility",
-      previous_issue_description: "Rejection of withrwaslasas",
-      previous_decision_date: modification_request_decision_date,
-      previous_modification_request_reason: "Please withdwasdadsadadadad"
-    }
-  end
-
   describe "class methods" do
     describe ".from_change_data" do
       subject { described_class.from_change_data(event_type, change_data) }
@@ -260,6 +143,7 @@
 
         it "should create an instance and not raise an error" do
           claim_history_event = subject
+
           expect_attributes(claim_history_event, status_event_attribute_data)
         end
       end
@@ -280,25 +164,6 @@
           expect { subject }.to raise_error(InvalidEventType)
         end
       end
-
-      context "when the event type is request addition" do
-        let(:event_type) { :addition }
-
-        it "should create an instance with issue request addition" do
-          claim_history_event = subject
-
-          expect_attributes(claim_history_event, issue_modification_request_attribute_data)
-        end
-      end
-
-      context "when the event type is request modification" do
-        let(:event_type) { :modification }
-        let(:request_type) { :modification }
-        it "should create an instance with issue request addition" do
-          claim_history_event = subject
-          expect_attributes(claim_history_event, issue_modification_request_attribute_data)
-        end
-      end
     end
 
     describe ".create_completed_disposition_event" do
@@ -347,7 +212,7 @@
 
       context "if the task status was assigned -> completed" do
         let(:version_changes) do
-          "---\n" \
+          "{\"---\n" \
           "closed_at:\n" \
           "- \n" \
           "- 2023-11-08 19:22:47.244142348 Z\n" \
@@ -356,7 +221,8 @@
           "- completed\n" \
           "updated_at:\n" \
           "- 2023-11-08 19:22:47.227634704 Z\n" \
-          "- 2023-11-09 19:22:47.244304624 Z\n"
+          "- 2023-11-09 19:22:47.244304624 Z\n" \
+          "\"}"
         end
 
         it "should create an in progress event and a completed status event" do
@@ -373,7 +239,7 @@
 
       context "if the task status was assigned -> cancelled" do
         let(:version_changes) do
-          "---\n" \
+          "{\"---\n" \
           "closed_at:\n" \
           "- \n" \
           "- 2023-11-09 23:16:28.446266110 Z\n" \
@@ -382,7 +248,8 @@
           "- cancelled\n" \
           "updated_at:\n" \
           "- 2023-11-09 23:16:15.724150103 Z\n" \
-          "- 2023-11-11 23:16:28.446399290 Z\n"
+          "- 2023-11-11 23:16:28.446399290 Z\n" \
+          "\"}"
         end
 
         it "should generate an in progress and a cancelled status event" do
@@ -399,7 +266,7 @@
 
       context "if the task status was assigned -> on_hold -> assigned -> completed" do
         let(:version_changes) do
-          "---\n" \
+          "{\"---\n" \
           "status:\n" \
           "- assigned\n" \
           "- on_hold\n" \
@@ -409,7 +276,7 @@
           "updated_at:\n" \
           "- 2023-10-19 22:39:14.207143000 Z\n" \
           "- 2023-10-19 22:45:43.148742110 Z\n" \
-          "|||---\n" \
+          "\",---\n" \
           "status:\n" \
           "- on_hold\n" \
           "- assigned\n" \
@@ -419,7 +286,7 @@
           "updated_at:\n" \
           "- 2023-10-19 22:45:43.148742000 Z\n" \
           "- 2023-10-19 22:47:16.222311778 Z\n" \
-          "|||---\n" \
+          "\",---\n" \
           "status:\n" \
           "- assigned\n" \
           "- completed\n" \
@@ -428,7 +295,8 @@
           "- 2023-10-19 22:48:25.322988083 Z\n" \
           "updated_at:\n" \
           "- 2023-10-19 22:47:16.222311000 Z\n" \
-          "- 2023-10-19 22:48:25.324023984 Z\n"
+          "- 2023-10-19 22:48:25.324023984 Z\n" \
+          "\"}"
         end
 
         it "should generate four status events" do
@@ -455,7 +323,7 @@
 
       context "if the task has no decision date and the task status was immediately set to on hold during intake" do
         let(:version_changes) do
-          "---\n" \
+          "{\"---\n" \
           "status:\n" \
           "- assigned\n" \
           "- on_hold\n" \
@@ -465,7 +333,7 @@
           "updated_at:\n" \
           "- 2023-10-19 22:39:14.207143000 Z\n" \
           "- 2023-10-19 22:39:14.207143000 Z\n" \
-          "|||---\n" \
+          "\",---\n" \
           "status:\n" \
           "- on_hold\n" \
           "- assigned\n" \
@@ -475,7 +343,7 @@
           "updated_at:\n" \
           "- 2023-10-19 22:45:43.148742000 Z\n" \
           "- 2023-10-19 22:47:16.222311778 Z\n" \
-          "|||---\n" \
+          "\",---\n" \
           "status:\n" \
           "- assigned\n" \
           "- completed\n" \
@@ -484,7 +352,8 @@
           "- 2023-10-19 22:48:25.322988083 Z\n" \
           "updated_at:\n" \
           "- 2023-10-19 22:47:16.222311000 Z\n" \
-          "- 2023-10-19 22:48:25.324023984 Z\n"
+          "- 2023-10-19 22:48:25.324023984 Z\n" \
+          "\"}"
         end
 
         it "should create an on_hold event, an in progress event, and a completed event" do
@@ -519,7 +388,7 @@
 
       context "if the task versions are from a hookless papertrail cancelled task" do
         let(:version_changes) do
-          "--- {}\n|||--- {}\n"
+          "{\"--- {}\n\",\"--- {}\n\"}"
         end
 
         it "should create an assigned and a cancelled task status event" do
@@ -762,187 +631,6 @@
       end
     end
 
-    describe ".create_pending_status_event" do
-      let(:event_date) { change_data["issue_modification_request_created_at"] }
-      let(:is_assigned_present) { true }
-
-      subject { described_class.create_pending_status_event(change_data, event_date) }
-
-      it "should return one pending event" do
-        expect_attributes(subject, pending_attribute_data)
-      end
-
-      context "it should return pending event if issue modification requests are made in two different days" do
-        before do
-          change_data["previous_imr_created_at"] = previous_imr_created_at
-        end
-
-        it "should return one pending event" do
-          expect_attributes(subject, pending_attribute_data)
-        end
-      end
-
-      context "it should not pending event if issue modification requests are made in same transaction" do
-        let(:previous_imr_created_at) { issue_modification_request_created_at }
-
-        before do
-          change_data["previous_imr_created_at"] = previous_imr_created_at
-          change_data["issue_modification_request_created_at"] = issue_modification_request_created_at
-        end
-
-        it "should return one pending event" do
-          expect(subject).to be_nil
-        end
-      end
-    end
-
-    describe ".create_issue_modification_request_event" do
-      context "when request type is modification" do
-        let(:request_type) { :modification }
-        let(:previous_state_array) do
-          "---\n" \
-            "id: 150\n" \
-            "status: assigned\n" \
-            "requestor_id: 2000006012\n" \
-            "nonrating_issue_category: Caregiver | Eligibility\n" \
-            "decision_date: 2024-07-28\n" \
-            "nonrating_issue_description: 'Rejection of withrwaslasas'\n" \
-            "request_reason: Please withdwasdadsadadadad\n" \
-            "withdrawal_date: 2024-08-04 04:00:00.000000000 Z\n" \
-            "edited_at: \n" \
-            "request_issue_id: 251\n" \
-            "request_type: modification\n" \
-            "benefit_type: vha\n" \
-            "created_at: 2024-08-26 17:22:53.454663000 Z\n" \
-            "decided_at: \n" \
-            "decider_id: \n" \
-            "decision_reason: \n" \
-            "decision_review_id: 31\n" \
-            "decision_review_type: SupplementalClaim\n" \
-            "remove_original_issue: false\n" \
-            "updated_at: 2024-08-26 17:22:53.454663000 Z\n" \
-            "|||---\n" \
-            "id: 150\n" \
-            "status: assigned\n" \
-            "requestor_id: 2000006012\n" \
-            "nonrating_issue_category: Caregiver | Eligibility\n" \
-            "decision_date: 2024-07-28\n" \
-            "nonrating_issue_description: 'Rejection of withrwaslasas'\n" \
-            "request_reason: Please  Withdraw this one since its no longer valid.\n" \
-            "withdrawal_date: 2024-08-04 04:00:00.000000000 Z\n" \
-            "edited_at: 2024-08-26 17:23:28.055850000 Z\n" \
-            "request_issue_id: 251\n" \
-            "request_type: modification\n" \
-            "benefit_type: vha\n" \
-            "created_at: 2024-08-26 17:22:53.454663000 Z\n" \
-            "decided_at: \n" \
-            "decider_id: \n" \
-            "decision_reason: \n" \
-            "decision_review_id: 31\n" \
-            "decision_review_type: SupplementalClaim\n" \
-            "remove_original_issue: false\n" \
-            "updated_at: 2024-08-26 17:23:28.072803000 Z\n"
-        end
-
-        subject { described_class.create_issue_modification_request_event(change_data) }
-
-        it "should return single event with request_type passed as the request_type" do
-          verify_attributes_and_count(subject, 1, modification_attribute_data)
-        end
-      end
-    end
-
-    describe ".create_edited_request_issue_events" do
-      let(:request_type) { :withdrawal }
-      let(:imr_versions) do
-        "---\n" \
-        "nonrating_issue_description:\n" \
-        "- First value\n" \
-        "- modifiedvalue\n" \
-        "request_reason:\n" \
-        "- Addition is the only request issue\n" \
-        "- Addition is the only request issue-modifiedvalue Z\n" \
-        "edited_at:\n" \
-        "- \n" \
-        "- 2024-07-19 22:39:14.207143000 Z\n" \
-        "updated_at:\n" \
-        "- 2024-07-19 22:39:14.207143000 Z\n" \
-        "- 2024-07-19 22:39:14.207143000 Z\n" \
-        "|||---\n" \
-        "status:\n" \
-        "- assigned\n" \
-        "- approved\n" \
-        "nonrating_issue_description:\n" \
-        "- modifiedvalue \n" \
-        "- approved by me\n" \
-        "updated_at:\n" \
-        "- 2024-07-19 22:45:43.148742000 Z\n" \
-        "- 2024-07-19 22:47:16.222311778 Z\n"
-      end
-      let(:previous_state_array) do
-        "---\n" \
-          "id: 150\n" \
-          "status: assigned\n" \
-          "requestor_id: 2000006012\n" \
-          "nonrating_issue_category: Caregiver | Eligibility\n" \
-          "decision_date: 2024-07-28\n" \
-          "nonrating_issue_description: 'Rejection of withrwaslasas'\n" \
-          "request_reason: Please withdwasdadsadadadad\n" \
-          "withdrawal_date: 2024-08-04 04:00:00.000000000 Z\n" \
-          "edited_at: \n" \
-          "request_issue_id: 251\n" \
-          "request_type: withdrawal\n" \
-          "benefit_type: vha\n" \
-          "created_at: 2024-08-26 17:22:53.454663000 Z\n" \
-          "decided_at: \n" \
-          "decider_id: \n" \
-          "decision_reason: \n" \
-          "decision_review_id: 31\n" \
-          "decision_review_type: SupplementalClaim\n" \
-          "remove_original_issue: false\n" \
-          "updated_at: 2024-08-26 17:22:53.454663000 Z\n" \
-          "|||---\n" \
-          "id: 150\n" \
-          "status: assigned\n" \
-          "requestor_id: 2000006012\n" \
-          "nonrating_issue_category: Caregiver | Eligibility\n" \
-          "decision_date: 2024-07-28\n" \
-          "nonrating_issue_description: 'Rejection of withrwaslasas'\n" \
-          "request_reason: Please  Withdraw this one since its no longer valid.\n" \
-          "withdrawal_date: 2024-08-04 04:00:00.000000000 Z\n" \
-          "edited_at: 2024-08-26 17:23:28.055850000 Z\n" \
-          "request_issue_id: 251\n" \
-          "request_type: withdrawal\n" \
-          "benefit_type: vha\n" \
-          "created_at: 2024-08-26 17:22:53.454663000 Z\n" \
-          "decided_at: \n" \
-          "decider_id: \n" \
-          "decision_reason: \n" \
-          "decision_review_id: 31\n" \
-          "decision_review_type: SupplementalClaim\n" \
-          "remove_original_issue: false\n" \
-          "updated_at: 2024-08-26 17:23:28.072803000 Z\n"
-      end
-
-      before do
-        change_data["decided_at"] = Time.zone.parse("2023-10-21 22:47:16.233187")
-        change_data["next_decided_or_cancelled_at"] = out_of_bounds_time
-        change_data["next_created_at"] = out_of_bounds_time
-        # The event is generated via the versions so it needs to match the status instead of cancelled.
-        # It's not important for generation, but it's a more correct data state for a claim with a single approved IMR
-        change_data["issue_modification_request_status"] = "approved"
-      end
-      subject { described_class.create_edited_request_issue_events(change_data) }
-
-      it "returns request_edited event type with multiple events" do
-        expect(subject.count).to be(4)
-        expect_attributes(subject[0], pending_attribute_data)
-        expect_attributes(subject[1], issue_modification_response_attribute)
-        expect_attributes(subject[3], issue_modification_edited_attribute)
-        expect_attributes(subject[2], in_progress_attribute_data)
-      end
-    end
-
     describe "helper class methods" do
       describe ".retrieve_issue_data" do
         before do
@@ -1094,9 +782,7 @@
             event_instance.readable_task_status, event_instance.days_waiting, event_instance.readable_claim_type,
             event_instance.readable_facility_name, event_instance.readable_user_name,
             event_instance.readable_event_date, event_instance.readable_event_type,
-            event_instance.send(:issue_or_status_information),
-            event_instance.send(:issue_modification_request_information),
-            event_instance.send(:disposition_information)
+            event_instance.send(:issue_or_status_information), event_instance.send(:disposition_information)
           ]
         end
 
@@ -1165,14 +851,6 @@
             expect(subject).to eq("Supplemental Claim")
           end
         end
-
-        context "when the claim type is Remand" do
-          let(:change_data_claim_type) { "Remand" }
-
-          it "readable claim type of Remand" do
-            expect(subject).to eq("Remand")
-          end
-        end
       end
 
       describe ".readable_user_name" do
@@ -1234,16 +912,7 @@
           added_issue: "Added issue",
           withdrew_issue: "Withdrew issue",
           removed_issue: "Removed issue",
-          added_decision_date: "Added decision date",
-          cancelled: "Claim closed",
-          addition: "Requested issue addition",
-          removal: "Requested issue removal",
-          modification: "Requested issue modification",
-          withdrawal: "Requested issue withdrawal",
-          request_approved: "Approval of request - issue addition",
-          request_denied: "Rejection of request - issue addition",
-          request_cancelled: "Cancellation of request",
-          request_edited: "Edit of request - issue addition"
+          added_decision_date: "Added decision date"
         }
 
         event_types.each do |event_type, readable_name|
@@ -1462,9 +1131,4 @@ def expect_attributes(object_instance, attribute_value_pairs)
       expect(object_instance.send(attribute)).to eq(expected_value)
     end
   end
-
-  def verify_attributes_and_count(subject, num_of_records, attributes)
-    expect(subject.count).to eq(num_of_records)
-    expect_attributes(subject[0], attributes)
-  end
 end
diff --git a/spec/services/claim_change_history/claim_history_service_spec.rb b/spec/services/claim_change_history/claim_history_service_spec.rb
index c26c6f4d2e9..fe244f251b5 100644
--- a/spec/services/claim_change_history/claim_history_service_spec.rb
+++ b/spec/services/claim_change_history/claim_history_service_spec.rb
@@ -13,14 +13,6 @@
                           benefit_type: "vha",
                           claimant_type: :dependent_claimant))
   end
-  let!(:hlr_task_with_imr) do
-    create(:issue_modification_request,
-           :with_higher_level_review,
-           :edit_of_request,
-           :update_decider,
-           nonrating_issue_category: "Medical and Dental Care Reimbursement")
-  end
-
   let!(:extra_hlr_request_issue) do
     create(:request_issue,
            nonrating_issue_category: "Camp Lejune Family Member",
@@ -88,8 +80,6 @@
     ]
   end
 
-  let(:total_event_count) { 22 }
-
   let(:expected_sc_event_types) do
     [
       :added_issue,
@@ -98,19 +88,6 @@
     ]
   end
 
-  let(:expected_imr_event_types) do
-    [
-      :claim_creation,
-      :added_issue,
-      :in_progress,
-      :pending,
-      :addition,
-      :request_edited,
-      :request_approved,
-      :in_progress
-    ]
-  end
-
   before do
     # Remove the versions to setup specific versions
     hlr_task.versions.each(&:delete)
@@ -169,14 +146,14 @@
         expect(events).to eq(service_instance.events)
 
         # Expect to get back all the combined event types
-        all_event_types = expected_hlr_event_types + expected_sc_event_types + expected_imr_event_types
-        expect(events.count).to eq(total_event_count)
+        all_event_types = expected_hlr_event_types + expected_sc_event_types
+        expect(events.count).to eq(14)
         expect(events.map(&:event_type)).to contain_exactly(*all_event_types)
 
         # Verify the issue data is correct for the completed_dispostion events
         disposition_events = events.select { |event| event.event_type == :completed_disposition }
         disposition_issue_types = ["Caregiver | Other", "Camp Lejune Family Member"]
-        disposition_issue_descriptions = ["VHA - Caregiver", "Camp Lejune description"]
+        disposition_issue_descriptions = ["VHA - Caregiver ", "Camp Lejune description"]
         disposition_user_names = ["Gaius Baelsar", "Gaius Baelsar"]
         disposition_values = %w[Granted denied]
         disposition_dates = [5.days.ago.to_date.to_s] * 2
@@ -188,12 +165,9 @@
         expect(disposition_events.map(&:disposition_date)).to contain_exactly(*disposition_dates)
 
         # Verify the issue data is correct for all the add issue events
-        added_issue_types = [*disposition_issue_types, "CHAMPVA", "Beneficiary Travel", "Caregiver | Other"]
-        added_issue_descriptions = [*disposition_issue_descriptions,
-                                    "Withdrew CHAMPVA",
-                                    "VHA issue description ",
-                                    "VHA - Caregiver"]
-        added_issue_user_names = ["Lauren Roth", "Lauren Roth", "Lauren Roth", "Eleanor Reynolds", "Lauren Roth"]
+        added_issue_types = [*disposition_issue_types, "CHAMPVA", "Beneficiary Travel"]
+        added_issue_descriptions = [*disposition_issue_descriptions, "Withdrew CHAMPVA", "VHA issue description "]
+        added_issue_user_names = ["Lauren Roth", "Lauren Roth", "Lauren Roth", "Eleanor Reynolds"]
         add_issue_events = events.select do |event|
           event.event_type == :added_issue || event.event_type == :added_issue_without_decision_date
         end
@@ -230,353 +204,6 @@
       end
     end
 
-    context "issue modification edge cases" do
-      let!(:sc_task_with_imrs) do
-        create(:supplemental_claim_vha_task,
-               appeal: create(:supplemental_claim,
-                              :with_vha_issue,
-                              :with_intake,
-                              benefit_type: "vha",
-                              claimant_type: :veteran_claimant))
-      end
-
-      let(:request_issue) { sc_task_with_imrs.appeal.request_issues.first }
-      let(:supplemental_claim) { sc_task_with_imrs.appeal }
-
-      let(:starting_imr_events) do
-        [:claim_creation, :added_issue, :in_progress, :removal, :pending, :addition]
-      end
-
-      let!(:issue_modification_addition) do
-        create(:issue_modification_request,
-               request_type: "addition",
-               decision_review: supplemental_claim,
-               requestor: vha_user,
-               nonrating_issue_category: "CHAMPVA",
-               nonrating_issue_description: "Starting issue description",
-               decision_date: 5.days.ago)
-      end
-
-      let(:issue_modification_modify) do
-        create(:issue_modification_request,
-               request_type: "modification",
-               decision_review: supplemental_claim,
-               requestor: vha_user,
-               request_issue: supplemental_claim.request_issues.first)
-      end
-
-      # Only generate the events for this task to keep it focused on the issue modification request events
-      let!(:filters) { { task_id: [sc_task_with_imrs.id] } }
-
-      let(:vha_admin) { create(:user, full_name: "VHA ADMIN", css_id: "VHAADMIN") }
-      let(:vha_user) { create(:user, full_name: "VHA USER", css_id: "VHAUSER") }
-
-      before do
-        OrganizationsUser.make_user_admin(vha_admin, VhaBusinessLine.singleton)
-        VhaBusinessLine.singleton.add_user(vha_user)
-        Timecop.freeze(Time.zone.now)
-      end
-
-      after do
-        Timecop.return
-      end
-
-      def create_last_addition_and_verify_events(original_events, current_events)
-        new_events = current_events.dup
-        Timecop.travel(2.minutes.from_now)
-        addition = create(:issue_modification_request, request_type: "addition", decision_review: supplemental_claim)
-
-        events = service_instance.build_events
-        new_events.push(:addition, :pending)
-        expect(events.map(&:event_type)).to contain_exactly(*original_events + new_events)
-
-        # Approve the newest addition to make sure the in progress and approval events are correct
-        Timecop.travel(2.minutes.from_now)
-        addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason2")
-
-        events = service_instance.build_events
-        new_events.push(:in_progress, :request_approved)
-        expect(events.map(&:event_type)).to contain_exactly(*original_events + new_events)
-      end
-
-      it "should correctly generate temporary in progress and pending events for a single imr event" do
-        events = subject
-        one_imr_events = *starting_imr_events - [:removal]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events)
-
-        # Make an edit to the addition and make sure the events are correct
-        Timecop.travel(2.minutes.from_now)
-        issue_modification_addition.update!(edited_at: Time.zone.now, nonrating_issue_category: "CHAMPVA")
-
-        # Rebuild events
-        service_instance.build_events
-        new_events = [:request_edited]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Approve the addition and make sure the events are correct
-        # NOTE: This only does the issue modification events and does not create a request issue update
-        Timecop.travel(2.minutes.from_now)
-        issue_modification_addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason")
-
-        # Rebuild events
-        service_instance.build_events
-        new_events.push(:in_progress, :request_approved)
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Create another addition IMR to verify that the event sequence works through one more iteration
-        create_last_addition_and_verify_events(one_imr_events, new_events)
-      end
-
-      it "should correctly generate events for an imr that is cancelled while another is added" do
-        events = subject
-        one_imr_events = *starting_imr_events - [:removal]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events)
-
-        # Cancel the addition IMR at the same time as creating a new issue modification request to
-        # modify the existing request issue on the supplemental claim
-        Timecop.travel(2.minutes.from_now)
-        ActiveRecord::Base.transaction do
-          issue_modification_addition.update!(status: "cancelled")
-          issue_modification_modify
-        end
-
-        # Rebuild events
-        service_instance.build_events
-        new_events = [:modification, :request_cancelled]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Approve the modification to verify that it create a new in progress event and a denied event
-        Timecop.travel(2.minutes.from_now)
-        issue_modification_modify.update!(decider: vha_admin, status: :denied, decision_reason: "Better reason")
-
-        # Rebuild events
-        service_instance.build_events
-        new_events.push(:in_progress, :request_denied)
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Create another addition IMR to verify that the event sequence works through one more iteration
-        create_last_addition_and_verify_events(one_imr_events, new_events)
-      end
-
-      it "should correctly track the previous version data for multiple IMR edits" do
-        events = subject
-        one_imr_events = *starting_imr_events - [:removal]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events)
-
-        # Edit several fields to create a new version of the IMR
-        Timecop.travel(2.minutes.from_now)
-        issue_modification_addition.update!(nonrating_issue_category: "Other",
-                                            nonrating_issue_description: "Edited description 1",
-                                            edited_at: Time.zone.now)
-
-        # Rebuild events
-        service_instance.build_events
-        new_events = [:request_edited]
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Edit several fields to create a new version of the IMR
-        Timecop.travel(2.minutes.from_now)
-        issue_modification_addition.update!(nonrating_issue_description: "Edited description 2",
-                                            edited_at: Time.zone.now)
-
-        # Rebuild events
-        service_instance.build_events
-        new_events.push(:request_edited)
-        expect(events.map(&:event_type)).to contain_exactly(*one_imr_events + new_events)
-
-        # Verify that each of the edited events has the information from the previous version
-        edited_events = events.select { |event| event.event_type == :request_edited }
-
-        first_edit = edited_events.first
-        second_edit = edited_events.last
-
-        expect(first_edit).to have_attributes(
-          new_issue_description: "Edited description 1",
-          new_issue_type: "Other",
-          previous_issue_description: "Starting issue description",
-          previous_issue_type: "CHAMPVA"
-        )
-
-        expect(second_edit).to have_attributes(
-          new_issue_description: "Edited description 2",
-          new_issue_type: "Other",
-          previous_issue_description: "Edited description 1",
-          previous_issue_type: "Other"
-        )
-      end
-
-      context "starting with two imrs" do
-        let!(:issue_modification_removal) do
-          create(:issue_modification_request,
-                 request_type: "removal",
-                 request_issue: request_issue,
-                 decision_review: supplemental_claim)
-        end
-
-        it "should correctly generate temporary in progress events for two imrs created at the same time" do
-          events = subject
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events)
-
-          # Deny the removal and make sure the events are correct
-          Timecop.travel(2.minutes.from_now)
-          issue_modification_removal.update!(decider: vha_admin, status: :denied, decision_reason: "Just cause")
-
-          # Rebuild events
-          service_instance.build_events
-          new_events = [:request_denied]
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Approve the addition and make sure the events are correct
-          # NOTE: This only does the issue modification events and does not create a request issue update
-          Timecop.travel(2.minutes.from_now)
-          issue_modification_addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason")
-
-          # Rebuild events
-          service_instance.build_events
-          new_events.push(:in_progress, :request_approved)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Create another addition IMR to verify that the event sequence works through one more iteration
-          create_last_addition_and_verify_events(starting_imr_events, new_events)
-        end
-
-        it "should correctly generate temporary in progress events for two imrs decided at the same time" do
-          events = subject
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events)
-
-          # Deny the removal and approve the addition and make sure the events are correct
-          Timecop.travel(2.minutes.from_now)
-          ActiveRecord::Base.transaction do
-            issue_modification_removal.update!(decider: vha_admin, status: :denied, decision_reason: "Just cause")
-            issue_modification_addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason")
-          end
-
-          # Rebuild events
-          service_instance.build_events
-          new_events = [:request_denied, :request_approved, :in_progress]
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Create another addition IMR to verify that the event sequence works through one more iteration
-          Timecop.travel(2.minutes.from_now)
-          addition2 = create(:issue_modification_request, request_type: "addition", decision_review: supplemental_claim)
-
-          service_instance.build_events
-          new_events.push(:addition, :pending)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Approve the newest addition to make sure the in progress and approval events are correct
-          Timecop.travel(2.minutes.from_now)
-          addition2.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason2")
-
-          service_instance.build_events
-          new_events.push(:in_progress, :request_approved)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Create another addition IMR to verify that the event sequence works through one more iteration
-          create_last_addition_and_verify_events(starting_imr_events, new_events)
-        end
-
-        it "should correctly generate temporary in progress events for two imrs with one cancelled in reverse order" do
-          events = subject
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events)
-
-          # Approve the addition and make sure the events are correct
-          # NOTE: This only does the issue modification events and does not create a request issue update
-          Timecop.travel(2.minutes.from_now)
-          issue_modification_addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason")
-
-          # Rebuild events
-          service_instance.build_events
-          new_events = [:request_approved]
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Cancel the removal and make sure the events are correct
-          Timecop.travel(2.minutes.from_now)
-          issue_modification_removal.update!(decider: vha_admin, status: :cancelled, decision_reason: "Just cause")
-
-          # Rebuild events
-          service_instance.build_events
-          new_events.push(:request_cancelled, :in_progress)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Create another addition IMR to verify that the event sequence works through one more iteration
-          create_last_addition_and_verify_events(starting_imr_events, new_events)
-        end
-
-        it "when an imr is cancelled at the same time and another is created" do
-          events = subject
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events)
-
-          # Approve the addition and make sure the events are correct
-          # NOTE: This only does the issue modification events and does not create a request issue update
-          Timecop.travel(2.minutes.from_now)
-          issue_modification_addition.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason")
-
-          # Rebuild events
-          service_instance.build_events
-          new_events = [:request_approved]
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Cancel the removal and add a new approval at the same time
-          Timecop.travel(2.minutes.from_now)
-          addition2 = nil
-          ActiveRecord::Base.transaction do
-            issue_modification_removal.update!(decider: vha_admin, status: :cancelled, decision_reason: "Just cause")
-            addition2 = create(:issue_modification_request,
-                               request_type: "addition",
-                               decision_review: supplemental_claim)
-          end
-
-          # Rebuild events
-          service_instance.build_events
-          new_events.push(:request_cancelled, :addition)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Approve the newest addition to make sure the in progress and approval events are correct
-          Timecop.travel(2.minutes.from_now)
-          addition2.update!(decider: vha_admin, status: :approved, decision_reason: "Better reason2")
-
-          service_instance.build_events
-          new_events.push(:in_progress, :request_approved)
-          expect(events.map(&:event_type)).to contain_exactly(*starting_imr_events + new_events)
-
-          # Create another addition IMR to verify that the event sequence works through one more iteration
-          create_last_addition_and_verify_events(starting_imr_events, new_events)
-        end
-      end
-
-      context "with multiple text edit in for a withdrawal event" do
-        let!(:issue_modification_withdrawal) do
-          create(:issue_modification_request,
-                 :withdrawal,
-                 request_issue: request_issue,
-                 decision_review: supplemental_claim,
-                 request_reason: "first comment in the array",
-                 nonrating_issue_description: "first nonrating description")
-        end
-
-        let!(:issue_modification_edit_of_request_first) do
-          issue_modification_withdrawal.nonrating_issue_description = "this is first update"
-          issue_modification_withdrawal.updated_at = Time.zone.today
-          issue_modification_withdrawal.save!
-        end
-
-        let!(:issue_modification_edit_of_request_second) do
-          issue_modification_withdrawal.nonrating_issue_description = "this is Second update"
-          issue_modification_withdrawal.withdrawal_date = Time.zone.today - 12.days
-          issue_modification_withdrawal.updated_at = Time.zone.today
-          issue_modification_withdrawal.save!
-        end
-
-        it "should have two request of edit event and a withdrawal event" do
-          events = service_instance.build_events
-          starting_event_without_removal = *starting_imr_events - [:removal]
-          new_events = [:withdrawal, :request_edited, :request_edited]
-          expect(events.map(&:event_type)).to contain_exactly(*starting_event_without_removal + new_events)
-        end
-      end
-    end
-
     context "with filters" do
       context "with task_id filter" do
         let(:filters) { { task_id: sc_task.id } }
@@ -610,10 +237,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
 
         it "should only return events for tasks that match the claim type filter" do
           subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(
-            *expected_hlr_event_types,
-            *expected_imr_event_types
-          )
+          expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_hlr_event_types)
         end
 
         context "with no filter matches" do
@@ -631,10 +255,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
 
         it "should only return events for the tasks that match the task status filter" do
           subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(
-            *expected_sc_event_types,
-            *expected_imr_event_types
-          )
+          expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_sc_event_types)
         end
 
         context "with no filter matches" do
@@ -675,7 +296,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
 
           it "should return events without a disposition" do
             subject
-            expect(service_instance.events.count).to eq(total_event_count)
+            expect(service_instance.events.count).to eq(14)
           end
         end
       end
@@ -687,9 +308,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
           subject
           expected_event_types = [
             :added_issue,
-            :completed_disposition,
-            :added_issue,
-            :request_edited
+            :completed_disposition
           ]
           expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_event_types)
         end
@@ -712,9 +331,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
               :added_issue,
               :completed_disposition,
               :added_issue,
-              :withdrew_issue,
-              :added_issue,
-              :request_edited
+              :withdrew_issue
             ]
             expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_event_types)
           end
@@ -730,7 +347,6 @@ def create_last_addition_and_verify_events(original_events, current_events)
             :added_issue,
             :added_issue,
             :added_issue,
-            :added_issue,
             :completed_disposition,
             :completed_disposition
           ]
@@ -764,8 +380,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
             subject
             expect(service_instance.events.map(&:event_type)).to contain_exactly(
               *expected_hlr_event_types,
-              *expected_sc_event_types,
-              *expected_imr_event_types
+              *expected_sc_event_types
             )
           end
         end
@@ -793,8 +408,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
             ]
             expect(service_instance.events.map(&:event_type)).to contain_exactly(
               *filtered_hlr_event_types,
-              *expected_sc_event_types,
-              *expected_imr_event_types
+              *expected_sc_event_types
             )
           end
         end
@@ -818,8 +432,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
             subject
             expect(service_instance.events.map(&:event_type)).to contain_exactly(
               *(expected_hlr_event_types - [:claim_creation]),
-              *expected_sc_event_types,
-              *expected_imr_event_types
+              *expected_sc_event_types
             )
           end
 
@@ -929,8 +542,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
           it "should return all events" do
             subject
             expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_hlr_event_types,
-                                                                                 *expected_sc_event_types,
-                                                                                 *expected_imr_event_types)
+                                                                                 *expected_sc_event_types)
           end
         end
       end
@@ -941,8 +553,7 @@ def create_last_addition_and_verify_events(original_events, current_events)
 
           it "should only return events for tasks that match the days waiting filter" do
             subject
-            expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_hlr_event_types,
-                                                                                 *expected_imr_event_types)
+            expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_hlr_event_types)
           end
         end
 
@@ -1055,64 +666,11 @@ def create_last_addition_and_verify_events(original_events, current_events)
           subject
           expected_event_types = [
             :completed,
-            :in_progress,
-            :request_approved
+            :in_progress
           ]
           expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_event_types)
         end
       end
-
-      context "with issue modification request task id" do
-        let(:filters) { { task_id: hlr_task_with_imr.decision_review.tasks.ids[0] } }
-        it "should only return the filtered events for the specific task ids" do
-          subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(*expected_imr_event_types)
-        end
-      end
-
-      context "with multiple filters for task id and event" do
-        let(:filters) do
-          { task_id: hlr_task_with_imr.decision_review.tasks.ids[0], events: [:added_issue, :claim_creation] }
-        end
-
-        it "should only return the filtered events for the specific task ids" do
-          subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(:added_issue, :claim_creation)
-        end
-      end
-
-      context "with multiple filters for task id and event" do
-        let(:filters) do
-          { task_id: hlr_task_with_imr.decision_review.tasks.ids[0], events: [:request_edited] }
-        end
-
-        it "should only return the filtered events for the specific task ids" do
-          subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(:request_edited)
-        end
-      end
-
-      context "with multiple filters for task id and event" do
-        let(:filters) do
-          { task_id: hlr_task_with_imr.decision_review.tasks.ids[0], events: [:request_approved] }
-        end
-
-        it "should only return the filtered events for the specific task ids" do
-          subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(:request_approved)
-        end
-      end
-
-      context "with multiple filters for task id and event" do
-        let(:filters) do
-          { task_id: hlr_task_with_imr.decision_review.tasks.ids[0], events: [:pending] }
-        end
-
-        it "should only return the filtered events for the specific task ids" do
-          subject
-          expect(service_instance.events.map(&:event_type)).to contain_exactly(:pending)
-        end
-      end
     end
   end
 end
diff --git a/spec/support/download_helper.rb b/spec/support/download_helper.rb
index 0fe587db62f..e31024f8ffd 100644
--- a/spec/support/download_helper.rb
+++ b/spec/support/download_helper.rb
@@ -11,8 +11,6 @@ module DownloadHelpers
 
   def downloads
     Dir.entries(WORKDIR)
-      .reject { |f| f == "." || f == ".." }
-      .map { |file| File.join(WORKDIR, file) }
   end
 
   def download
@@ -39,6 +37,6 @@ def downloading?
   end
 
   def clear_downloads
-    FileUtils.rm_rf(Dir.glob(File.join(WORKDIR, "*")))
+    FileUtils.rm_f(downloads)
   end
 end
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000000..f0b9254cd9e
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+node-bin-setup@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.1.3.tgz#d45d5220e3b2ecc3a94263a56116f727f6c1bb14"
+  integrity sha512-opgw9iSCAzT2+6wJOETCpeRYAQxSopqQ2z+N6BXwIMsQQ7Zj5M8MaafQY8JMlolRR6R1UXg2WmhKp0p9lSOivg==
+
+node@16.16.0:
+  version "16.16.0"
+  resolved "https://registry.yarnpkg.com/node/-/node-16.16.0.tgz#43ce8731d97ae79dff2f227e764938025200796d"
+  integrity sha512-uEZWEG6HuGbrRi6wEZIna4yWj197JByvJkMmi8Yxx9Z6y8GazVy0p2qYOwLYJqQRf4N37+eL+FBIdhT1mHGpFA==
+  dependencies:
+    node-bin-setup "^1.0.0"