Removed TODO comment and debug log message