Remove usage of @deprecated method