removing some unused code