Deprecated usages were removed.