Merge "Remove unused code" am: fad0863829
am: 4901342696

Change-Id: Ib5478645aa61706b6542196ada9797ad6ff10402