removed holder, transferred functionnality back to container