WIP - rm deprecated function usage from package provider