Remove dup code