[michael] Cleanup for security pmo