CR-IC-694 (cleanup)