Remove privacy hashing code; other minor fixes