remove stuff that was moved to providers (bug cleanup)
Merge pull request #1890 from andymckay/cleanup

remove stuff that was moved to providers (bug cleanup)