OZP-16: clean up