Clean recursive behavior up