:lipstick: Deprecations clean-up