do some more caller-id cleanup