Removed TODO and duplicates