Set remove (16/17)

Set remove