A little bit of clean-up
* mostly removed commented out code