FIX: Finish deprecations