Merge pull request #345 from oliverschmidt/master

Removed unnecessary code from resolver.