Changed separate matchers to cleanuppers
Removed need for cleanupper selector in matcher