Bridge Plugin Cleanup