Remove unused
Update private submodule