cleanup, include basemodules, rm workflow