improvement against dirty DB data and non-removable objects