Modules cleanup.