Removal of debugging code