minor ocap cleanup