Cleanup debugging code