Remove duplicate check