Final cleanup of the patch.
5 files changed