Refactor removing children