cleanup and updated submodules