Remove dead code since caller is known
More deprecation signature tests