Clean out some unused stuff