Remove some un-needed bits and pieces left around from previous tweaks.