Remove unused stuff.

It's easier to get familiar with the code if random leftovers are
dropped.

Change-Id: Ia259311c99eb3c3af1c1de7b2a56653006d64cc6