Fix object removal turning into crates