oc/uv: Cleanup