removed usages of deprecated API