Get rid of some unused stuff