remove some unused

Change-Id: I6192d6cf35f84aec34d6aa5afa739d5728159475