cleaned some unused code