Merge "Remove unused older version of psi-subset library"