Let's clean it up!

Removed all deprecations for 2.0.

Fixes #99