Cleanup of third-party plugins
Add some more abbreviations