Remove duplicate check
minor changes