Remove unused code

Change-Id: Ia624a624271b1143c96cd189cc9e4dab4c5ae302