removed references to old code