clde cleanup and warnings elimination