Merge "InitGitDir: Clean up created directories"