remove some map erases that weren't needed