Now cache has cleared remove superfluous modules

Change-Id: I9fd40bcb3002d3bb06ec39669bbc3bc989b95bdf
Merge "Now cache has cleared remove superfluous modules"