Python 3.9 to 3.10 validation and cleanup

Broke my system following this piece of advice in the Announcement post.