- Began refactoring for delayed GC