remove old with-many logic and replace with eager version