Don't forget about removed objects

If we insert an object and then remove it, but modify it after that,
it gets re-inserted to the database. This patch fixes this behaviour.
Do not fail if original state is not found for removed object

This is similar of what we do with mofified objects in this case.
Version increment