Some warnings removal and making CL code as default option