Opportunity clean up