Remove else. Remove resolve