SW1 - change in architecture - removing old solution