MERGE: #15512: Remove remnants of debugging code