Trimmed down plugins
Updated