Remove deprecated options