Fixed map clearing