COMMONS-190 : Juzu integration cleanup