Fix calls to removed function