Dialer: fix build and cleanup

Change-Id: Ie2b69c1348f33456515a395f9dd93e772b83b854