Remove some unused stuff.
Fix `gather` to use `hoistOver` parameter correctly.