Cleanup (remove plugin-specific code)