Merge "Cleaned up dead code"
am: 4f65edeaac

Change-Id: Ia73a9159c197ee3d1203c76cd92f1b1258d5be8a