CURATOR-147 Remove use of deprecated APIs