Updated garbage collection