Remove usage of @deprecated methods