better log message
remove commented out code
added debug logging