Normalize provider data

Start removing println statements