Merge branch 'remove-more-unnecessary-code'

1 job for master in 11 minutes and 50 seconds (queued for 1 second)