Change remove (7/16)

Change remove