An attempt to clean up some of the GC