remove yields/prop, use component/each