Clean-up for debug