remove unused file / cleanup, update submodule