Remove deprecated validator calls