Improve command line arguments, remove maps from git.