Some cleanup with the provision handling