tidy up merged modules