Some cleanup and added a few more plugins

Change-Id: I886682ab2561ddf63682becce85b3c4b3e6082dc