cleanup some unused code