Clean up multi-module