Code clean up

- Removed provider model usage from required adapter tests.
- Removed old to do comments.