Removed obsolete TODOs and added ticket references to those remaining

Change-Id: I613b848497864ace6fb38223f613331779f85742
7 files changed