Merge "Clean-up using onap section"