OZP-153 Cleanup