Strip out some unused stuff