Remove some unneeded code

Change-Id: I52b34a316950e92a3aa4c1675475fca8dc08d2c8
Merge "Remove some unneeded code" into android-4.4