Clean up debug codes