prettier

a1ce84a1 - Cleanup dead code from pr7461 (#7468)

Cleanup dead code from pr7461 (#7468) * Add test for #5810 * Remove maybe dead code * Add changelog * Remove old tests * More dead code