chore: 3.12 + cleanup (#4713)

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
6 files changed