Seem to have cleaned up submodule mess...