Added a TODO and removed some debugging.