Clean provider code
Clean provider code