Update submodules, clean up config