More parent/child action cleanup/work