Remove unused code

Change-Id: I1355317d6baeb180417cb5f1f34038925c1299cf