remove the extra code from onetoone