SSP-2010 , SSP-1998 , SSP-2032 , SSP-2031 - Some code cleanup after map
perf improvements