Fixed object removal, etc.
Rebuild.