Revised remove, but it still does not work correctly.