Added removeLinks and Options class added