ENH: More deprecation