removed redundant map