More Plugin Cleanup