Clearing up some stuff i left behind
OE-Flag: fixup serialisation, GC model + statem