CLC-2657 Clean up whitespace and remove commented-out portions