Small cleanup of unused stuff.