Cleanup and simplify

No match.