Remove unused code.
Minor tweaks.