Added garbage collection scaffold