cake-rows: cleanup