Removing obsolete TODO and logging