- remove some unused/commented code
- update Log Handler