cleanup commented code
added log