SSP-2732 Remove dead code (commented out)