- Remove unused code

Change-Id: I71f5eff28b2760e590dee061103e4679e7212e7c