fix remove code that does not need