OAK-1475 - deleted old services, fixed remote / embedded conf providers