Change remove (6/16)

Change remove