removed some unused services and targets