cleaned out some unused stuff