Leftover removal and minor tweaks.