Removed some factories for services only used once.