lots of cleanup to pathery-client-shared