Clean up type deprecations