Clean up more deprecation