Removed submodules
Misc cleanups