cleanup some of the unused code