Removing unnecessary map