In 532 Tribonian was removed as quaestor due to the charges made by his enemies during the Nika riots, but he continued to work on the codification.[10] He was restored to his post as quaestor in 535 and continued in that position until his death.[11] Tribonian continued to help draft new laws for Justinian; these new laws (Novellae Constitutiones) were later combined with the Codex Justinianus, the Digest and the Institutes to comprise the Corpus Juris Civilis.