add some remove code.