Remove duplicate code from icr
Merge branch 'icr' of https://github.com/prep/crystal into icr