SSP-1461 - code cleanup