Initial parent/child queries cleanup.