Remove ContainerElement and allow all elements to contain children