Fixed the object removal