Telephone: code cleanup

Change-Id: I3f1f2efedcb16f200125619d6739f9a9975ba89e