Turning off deps, wondering whether this should be resolved in infra layer