Remove etro dependency

I'm not sure why it pulled in other commits.