Also remove some unused code Bug: 33759208 Test: visual Change-Id: I0a019bf6b514564f9e6e844de8a6b75b2ca69cc7
Bug: 27151995 Change-Id: If7c9620b816ae4f08b5a41dd7c88469184efe234