Remove old filter and unused scopes