Merge "Remove dup code"