Remove duplicate code that already exists in cider 0.6, reuse cider functions