Remove usage of deprecated class