Remove duplicate code.
The server test configuration referenced an obsolete plugin.
Cleanup / segregate code that is intended for use in plugins.