Removed dup code