WIP - temp provider cleanup