Remove deprecated service