Tidy up some unused stuff.