just removing some unused code