removed some legacy test services