Remove deprecated functionality