Group plugins and remove rarely used
More plugins, minor fixes