cleanup and fixing submodule