Cleanup

Remove usage of deprecated APIs.