GC refactoring, remove "steps"