cleanup some unused functions