cleanup for easy use in submodule