:lipstick: Deprecations clean-up
Merge pull request #180 from maksimov/develop

Deprecations clean-up
:lipstick: Deprecation clean-up strikes again
Merge pull request #182 from maksimov/develop

:lipstick: Deprecation clean-up strikes again