Telephony: Code cleanup

Change-Id: Ie1455781035b8b0c25651cacb5374bcd53f8524d