Remove unused and broken code

Change-Id: Ib5edb8bbb9bf06bfe430724b8336556e870af6ac
Merge "Remove unused and broken code"