Remove garbage collection redefinitions and revert a few other large changes likely to cause merge conflicts.