Took out more old code