Improve objects deletion