WIP: GC

Change-Id: I0cd91cd57ca1da8760ccb06b985a75a22744194e