scopevalidator cleanup