Remove unwanted modules

Change-Id: I861cfe7ce188a5e3a220493bb921084c83aedcba