remove dup code