removed usage of deprecated methods
(cherry picked from commit 442dc5b)