Removing more old code