removing more old code