Code cleanup.
Removed PhoneEntry class.No longer needed as the directory payload is
generic.