Begin to clean provider code