Fixed object removal bugs