More bugs; delete two submodules