More dead code and tweaks.