SSP-2327 Code cleanup