cleanup some unused stuff