cleanup [Module] creep