Fixes #5149

also fixes clean_map_git.sh (mloooc)