Some code cleanup of historic code.