Refactor removeContact(s).

* Make argument names consistent with rest of tested code.
* Add logging on exception.
* Leverage exceptions to simplify code structure.