More moving around of model logic, also corrected logic for whether the removal was successful.