clean-up some unused code