Remove duplicate checks