Remove additional Py2.5 compatibility checks
Funtests passing