Please consider the following two options:
Removing a caller ID will seldom be done. You would do it if a number was mistakenly assigned to a location for which you do not have a caller ID yet, but this would be a rare occurrence.
Using option 1 to remove a caller ID forces an extra click over option 2 (a confirmation dialog for the removal would still be necessary). However, users will come to this page 99% of the times to set up a new caller ID or change an existing one. My concern with option 2 is that -to facilitate 1% of the use cases- users may be confused, even if momentarily, by the presence of the remove buttons in the data grid.
What option would you use? Can you think of a better approach?
Thanks in advance.