cut out some unused stuff