cleaning up more dependencies to get them consumed from Orbit