Took out some of the unused code