Modularization
Remove lingering submodule reference