deleted some unused code