Some more cleanup, removing deprecation warnings