Merge pull request #180 from maksimov/develop

Deprecations clean-up