vaildation cleanup