Cleanup on gc bridge to support future optimizations