Merge branch 'remove-more-unnecessary-code'

1 job for master in 12 minutes and 3 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #11878
build

00:12:03