Update -validator to 2.1.0, update code accordingly

Remove ref expander for now.

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>