cleanup for submodules usage