FIX: Finish deprecations

Finished deprecations for 0.9 (I think). Running tests now.
ok I see! Thanks for the correction.