cleanup after review
CR-IC-4179 (cleanup)