More TODO and removed from old commented code that is no use anymore.