Remove code that was needed for <2.10 compatibility
Merge pull request #545 from sschaef/t-clean-up-2.10

Remove code that was needed for <2.10 compatibility