rolled back some broken garbage collection stuff