DEBUG cleanup