Separated insert/remove functions