Removed more dead code.  Now that updated deserialization code, no longer need to keep track of ad-hoc map index types.