Reduce unneccessary plugins

Change-Id: If337bc5b00f80dfcf54ac72d21beaf03118cdcef
6 files changed