removed refs to map table