7.x.latest cwrc lib

Should remove debugging code