More debug cleanup