GC compat
more cleanups