Remove unnecessary map accesses