Revert gc from its controller to main controller.

And fix runtime in unset_machine