Implementing removal of providers. Fixes #36