Remove some presumably dead code

Change-Id: I43b27ba14979a7c878605b89d896ed3ae5fe0389
Merge "Remove some presumably dead code"