Fixing broken submodules

Fix issues introduced by removing submodule refs