Validations plugin cleanup from #145