Clean up protocol extensions for Matched