minor cleanup
* remove dead code
* fix indentation