Get rid of LSPR and make it optionally go into TSPR