Cleaning up poms and adding parent to C and D