removed codiqua stuff