Took out some dead code