Clean up, trying again to do a submodule