fix for submodule, cleanup