Another cleanup.
Plugins update