Lingering changes from last big merge. Removing more superfluous code.