OP-1562  Cleanup