One more cleanup for certmaster (OMS-147)