General cleanup

[#72213116]