:lipstick: Deprecation clean-up strikes again