Cleanup modules after install

Change-Id: Icb73a57a429cd566664f27137238762268eb0b3f