Took out some unused code