still removing submodule leftovers