More deprecation removals