Remove dead code path

Change-Id: Ic92fdf32e1b74caedefebcc087ced6b89e40bfc1
Merge "Remove dead code path"