fixes and testing of child removal