changed remove
setMap not working all the time