Remove TODO and debug code