Style fixes.
Validator support was removed.