Resolves #95 Clean up debug emits in code