remove code dup