Some cleanup, more may be needed

No match.