Remove boilerplate that was only useful for python 2.5 which we don't support anymore