[513375] Trim debug code
13 files changed