Removed map submodule for now...