Update list, remove outdated comments

Change-Id: I308c7825bbff535c96f9a9811c7ca8e65dff07a4
Merge "Update list, remove outdated comments"