scrubbed the remaining 3.8 compatibility shims