Revert "Revert "Small frandom change and adding module cleaning script.""

This reverts commit 5aa6856f414e8a6ebc272516abac28f1c8a4d5c2.