Cleanup Plugin Architecture