Cleanup plugins

Cleanup plugins