base-validate cleanup