remove some unneeded servicelocator calls