Delete map implemented / TODO: code cleanup