Removed a useless TODO and log some more.

As discussed with @hwoarangmy