Unmodifiable collection bug

Use remove... methods instead of get().remove