More clean up and temporary move back to citeproc-js.