Added remove opt