Change remove (4/16)

Change remove