MODE-1745 Removed code that was commented out
MODE-1745 Corrected the names of the child references, which was recently changed (incorrectly)