More code cleanup, removed more code for Python versions prior to 2.6