Deleting some useless TODO and add story ID to others