Removed commented out code.
Change collection type in Resolver API and some other changes.