Removed old resolver code