removed test code
expnaded use of WPSC_Data_Map Class isntead of special purpose code