Undoing more of my branching mistake, delete submodules from master