Some more clean Up in provider