Removed usage of deprecated APIs.