AbstractProvider cleanup