Updated remove functions to support childViewController