NEXUS-5916: Cleanup of the plugin and IT