safe transaction
delete entity fixed
refactoring
refactoring