OZP-807 Cleanup