Code clean-up:

* member name changes
* remove dead and unused code