cleaning some unused code