Remove some code that should not be used anymore. A 2.7 release seems the right point for some minor interface breaking.