WIP: Allow GC to cleanup containers