More cleanup and get rid of `CString`