Validate cleanup

Not much to do here. Just removed some unreachable code and made a couple of pylint tweaks.