Remove duplicate code from icr
Merge pull request #90 from prep/icr

Remove unnecessary code from icr