Remove unused code

Change-Id: I4e1e9f8c9b98fa77c8149fc5f876a2e7777b19e8