Cleanup base class.

- removed unreachable code
- removed unused method (the locator was removed in a previous commit)
Merge pull request #91 from chirarobert/clean_base

Cleanup base class.