Skip some stuff when removing children for edit mode. Remove an unused client function and call. More profiling.