Change remove (8/16)

Change remove