BUG: Remove old comments.

Change-Id: I0365641e3a0ce1599d83d65b9efbd254a1493ef7
Merge "BUG: Remove old comments."