Events on map commented until fully functional