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