Some debug cleanup