Distribution: cleanup and remove privacy criteria