Cleaning up parent code