Fixing bug and temporariliy disabling object removal.