fixing up some unused stuff.