cleanup some unused things