Replaced removed function