Comment out resolve code