Change remove (14/16)

Change remove