remove match-stream from modules