Remove dead code

Change-Id: I198fb0193fed891c4dd8a8a92c29e36f6c4d48b9