Clean up code that targeted a specific scenario.