simplify models, add link remove