Remove two submodules

Making it easier to work in the future.