Clean-up of debugging code