Refactored CRDeadlinks