Add some despawning logic (but do not enable despawning yet)