Added diff +comments of updates to smem.cpp/h that need to be ported

Still need to track down changes to other files.
Commented out some dead code
Changed suppresswarnings annotation to use "rawtypes" instead of "unchecked"
Removed unnecessary serialVersionUID
Commented out some dead code