updated submodules and cleanup