Some debug changes still in place