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

This reverts commit c03e46d3a5ab05177e164cb9e8844acc8125421a.