Revert "CoDR"

This reverts commit 84d058a0a14196b89398f91a5a454aef4163a301.