Remove submodules other than Util, fix PP orders