Remove unnecessary search