Cleanup...
More submodule cleanup...