Clean up, and track all modules.