Remove comments around janky non java7 friendly code

Change-Id: Id1bd7859cb03eaff305f3173287e30d1e1230636