Deprecated method usages removed