Remove duplicate code block (from merge?)