minor clean-up of code, removing dead-code, etc.