Clean up debug log/comments