Remove unused stuff.

Change-Id: If733fef2e11349c7d07d36c476521f26916a0318