More clean up of generic map handling that is not meant to be a java object