cleanup to make less diff to codina