Cleanup base class.

  * removed unreachable code
  * removed unused method (the locator was removed in a previous commit)