Add better logging and naming
Remove summary element if element does not exists