cleanup after AccessValidatorSCS refactoring