removing unnecessary map