Redone model delete with some API work