remove dup logic