ClearMap functions fixed