Removed dup'd code