Better handling of "remove"