Small cleanups
Ensure modules are cleaned, via aggregation