SSP-2299 Action Plan- iteration demo cleanup tasks part 2