Deprecations sweep.
Merge pull request #188 from maksimov/develop

Deprecations sweep.