Remove resolve and use fabric env.resolve instead