Remove code that is dead now that we need >= 6.12 to build