handle fixes and delete entity