SSP-1185 - Code clean up.