Remove use of LsofCST type