ENH remove deprecated things (2)