Further validation cleanup.