Cleaned up redundant plugins and updated remaining plugins