Removed references to old code