Update remove code to destroy