<a title="Cleaning up" href="https://github.com/opencor/opencor/pull/1966">PR #1966</a>: Cleaning up