Remove new code smells

No match.