pytest 6+/python 3.9+ cleanup - dead code removal

pytest 6+/python 3.9+ cleanup - dead code removal #305