Submodule cleanup
Cleanup and removed submodule dependency