remove stuff that was moved to providers (bug cleanup)