[0.7] remove code deprecated earlier.