Added support for only removing children

- Also tidied up messages