- Furhter cleanup of unused code, added comments.