commented out CLM tracing
deleted out some commented, unused code