Remove code that was needed for <2.10 compatibility