Remove unnecessary map